9/26 优化1.0

src/views/basic/collectPoint/userWorkplace.vue

@@ -132,6 +132,11 @@
               <span>{{ workplaceStatusMap[scope.row.workplaceStatus] }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="工位类型" prop="workPlaceClass" width="90">
+            <template slot-scope="scope">
+              <span>{{ workPlaceClasss[scope.row.workPlaceClass] }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
           <el-table-column label="创建时间" prop="createTime" width="140"></el-table-column>
           <el-table-column label="备注" prop="remake" width="240"></el-table-column>
@@ -372,6 +377,10 @@ export default {
         3: '内部科室',
         4: '特殊往来'
       },
+      workPlaceClasss: {
+        1: '采集工位',
+        2: '上货工位'
+      },
       workplaceStatusMap: {
         0: '暂停',
         1: '启用'
@@ -415,6 +424,9 @@ export default {
       this.getUsers()
     },
     onUserReset() {
+      if(this.rowData.id == null){
+        return this.$message.error("请选择用户")
+      }
       this.workQuery = {
         page: 1,
         limit: 10,

src/views/basic/workplace/busTypeManage.vue

@@ -3,11 +3,11 @@
       <el-form :inline="true" :model="busQuery" class="query-form" size="mini"
                style="margin-bottom: 10px"
       >
-        <el-form-item class="query-form-item" label="业务类型编号/业务名称:">
+        <el-form-item class="query-form-item" label="业务名称:">
           <el-input
             style="width: 210px"
             v-model="busQuery.busKey"
-            placeholder="请输入业务类型编号/业务名称"
+            placeholder="业务名称"
             clearable
           ></el-input>
         </el-form-item>

src/views/basic/workplace/workplaceManage.vue

@@ -133,6 +133,11 @@
                   <span>{{ workplaceStatusMap[scope.row.workplaceStatus] }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="工位类型" prop="workPlaceClass" width="90">
+                <template slot-scope="scope">
+                  <span>{{ workPlaceClasss[scope.row.workPlaceClass] }}</span>
+                </template>
+              </el-table-column>
               <!--<el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>-->
               <!--<el-table-column label="单据类型编号" prop="busTypeCode" width="100"></el-table-column>-->
               <!--<el-table-column label="单据类型名称" prop="busTypeName" width="100"></el-table-column>-->
@@ -184,10 +189,10 @@
               <el-form :inline="true" :model="busQuery" class="query-form" size="mini"
                        style="margin-bottom: 10px"
               >
-                <el-form-item class="query-form-item" label="业务类型编号/业务名称:">
+                <el-form-item class="query-form-item" label="业务名称:">
                   <el-input
                     v-model="busQuery.busKey"
-                    placeholder="请输入业务类型编号/业务名称"
+                    placeholder="业务名称"
                     clearable
                   ></el-input>
                 </el-form-item>
@@ -416,6 +421,14 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="工位类型:" prop="workPlaceClass" class="query-form-item">
+              <el-select v-model="formData.workPlaceClass" style="width: 80%" placeholder="工位类型">
+                <el-option label="采集工位" :value="1"></el-option>
+                <el-option label="上货工位" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <!--<el-col :span="12" class="el-col">-->
           <!--  <el-form-item label="工位类型:" prop="workplaceType" class="query-form-item">-->
           <!--    <el-select v-model="formData.workplaceType" style="width: 80%" placeholder="工位类型">-->
@@ -523,9 +536,7 @@
           <!--          </el-col>-->
         </el-row>
 
-        <el-row :gutter="24" class="el-row">
 
-        </el-row>
 
         <!--<el-col :span="12" class="el-col">-->
         <!--  <el-form-item label="单据类型:" prop="orderId" class="query-form-item">-->
@@ -750,6 +761,7 @@ export default {
         workplaceName: null,
         workplaceStatus: 1,
         workplaceType: 3,
+        workPlaceClass: 1,
         deptCode: null,
         chargeUser: null,
         constituencies: null,
@@ -771,6 +783,9 @@ export default {
         checkInsert: [
           {required: true, message: '处理结果不能为空', trigger: 'blur'}
         ],
+        workPlaceClass: [
+          {required: true, message: '请选择工位类型', trigger: 'blur'}
+        ],
         // invRemindNumber: [
         //   { required: true, message: '请输入工位存量提醒数', trigger: 'blur' }
         // ],
@@ -844,6 +859,10 @@ export default {
         0: '暂停',
         1: '启用'
       },
+      workPlaceClasss: {
+        1: '采集工位',
+        2: '上货工位'
+      },
       orderFinishVerifys: {
         0: '完全赋码',
         1: '部分赋码',
@@ -1186,6 +1205,9 @@ export default {
       this.getUserBindWork(this.userQuery)
     },
     onBusTypeReset() {
+      if (this.rowData.workplaceId == null) {
+        return this.$message.error('请先选择工位')
+      }
       this.busQuery = {
         busKey: '',
         workplaceCode: null,
@@ -1213,6 +1235,9 @@ export default {
       this.chooseBusTypeDialogVisible = true
     },
     onUserReset() {
+      if (this.rowData.workplaceId == null) {
+        return this.$message.error('请先选择工位')
+      }
       this.userQuery = {
         page: 1,
         limit: 10,
@@ -1399,6 +1424,8 @@ export default {
       this.getWorkBindBusTypes()
     },
     changeDept(){
+      this.busTypeList = []
+      this.userList = []
       this.getList()
     }
   },

src/views/collect/IoSplitFinishCode.vue

@@ -1288,7 +1288,7 @@ export default {
       this.filterQuery.statusType = 'scan_code';
     }
 
-    getHead("IoSplitFinishCode", "1").then((re) => {
+    getHead("IoSplitFinishLog", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;