Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

src/views/basic/product/drug/drugAdd.vue

@@ -279,7 +279,7 @@
             </el-col>
           </el-row>
           <el-row type="flex" class="edit-row">
-            <el-col :span="12">
+            <el-col :span="11">
               <el-form-item label="收费项目编码:">
                 <el-input
                   style="width: 65%"
@@ -290,6 +290,14 @@
                 <el-button type="primary" size="mini"  style="margin-left: 10px" @click="selectPayFeecode">选入</el-button>
               </el-form-item>
             </el-col>
+            <el-col :span="11">
+              <el-form-item label="是否拆零:" prop="splitEnable">
+                <el-select v-model="newProductData.splitEnable" style="width: 90%" placeholder="是否拆零" clearable>
+                  <el-option label="是" :value="true"></el-option>
+                  <el-option label="否" :value="false"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row type="flex">
             <el-col :span="23" class="el-col">

src/views/collect/PanelOrderEndSearch.vue

@@ -273,6 +273,7 @@ export default {
 
       showSearch: true,
       filterQuery: {
+        tagStatus: 3,
         billNo: null,
         page: 1,
         limit: 10,

src/views/collect/fieldOperation.vue

@@ -5,6 +5,19 @@
     </div>
     <el-divider/>
     <!-- 分割线 -->
+    <el-form :model="query" class="query-form" size="mini" label-width="100px" :inline="true">
+      <el-form-item prop="key" label="工位信息:">
+        <el-input v-model="query.key" clearable placeholder="请输入工位信息"></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button-group style="margin-left: 10px;display:flex;">
+          <el-button type="primary" icon="el-icon-search" @click.native.stop="getStationList()">搜索</el-button>
+        </el-button-group>
+      </el-form-item>
+
+    </el-form>
+
 
     <el-row :gutter="8">
       <el-col v-for="(info, index)  in stationList"  :key="index" :xs="12" :sm="8" :md="8" :lg="6">
@@ -76,6 +89,13 @@ export default {
   name: 'fieldOperation',
   data() {
     return {
+      query:{
+        key: '',
+        status: 1,
+        invCode: this.$store.getters.locInvCode,
+        page: 1,
+        limit: 200
+      },
       // 假设这是你的卡片数据
       stationList: []
     };
@@ -91,13 +111,7 @@ export default {
       window.open(url, '_blank');
     },
     getStationList() {
-      let param = {
-        status: 1,
-        invCode: this.$store.getters.locInvCode,
-        page: 1,
-        limit: 200
-      }
-      listPage(param).then(res => {
+      listPage(this.query).then(res => {
         this.stationList = res.data?.list || []
       })
     },