9/29 界面优化1.0.2

src/views/basic/collectPoint/selectWorkplace.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
-      <el-row :gutter="20">
+      <el-row :gutter="24">
         <!--<el-col :span="8">-->
         <!--  <el-form-item label="当前仓库:" class="query-form-item">-->
         <!--    <invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
@@ -29,6 +29,14 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="工位类型:" prop="workPlaceClass" class="query-form-item" clearable>
+            <el-select v-model="query.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-row>
     </el-form>
     <div class="top-right-btn">
@@ -53,6 +61,11 @@
       <el-table-column type="index" label="序号"></el-table-column>
       <el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
       <el-table-column label="工位名称" prop="workplaceName" width="120"></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="workplaceStatus" width="90">
         <template slot-scope="scope">
           <span>{{ workplaceStatusMap[scope.row.workplaceStatus] }}</span>
@@ -70,7 +83,6 @@
         </template>
       </el-table-column>
       <el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
-      <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>
       <el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
       <el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
       <el-table-column label="备注" prop="remake" width="90"></el-table-column>
@@ -278,7 +290,9 @@ export default {
       query: {
         page: 1,
         limit: 10,
-        code: null
+        workPlaceClass: null,
+        code: null,
+        key: ""
       },
       workQuery: {
         userId: null,
@@ -340,6 +354,10 @@ export default {
         0: '暂停',
         1: '启用'
       },
+      workPlaceClasss: {
+        1: '采集工位',
+        2: '上货工位'
+      },
       workplaceTypes: {
         1: '拆零',
         2: '取整',
@@ -366,7 +384,10 @@ export default {
       })
       this.query = {
         page: 1,
-        limit: 20
+        limit: 10,
+        key: "",
+        workPlaceClass: null,
+        code: null
       }
       this.getList()
     },

src/views/basic/collectPoint/userWorkplace.vue

@@ -172,7 +172,7 @@
     <el-dialog
       title="选入工位"
       :visible.sync="selectUserWorkDialogVisible"
-      width="70%"
+      width="75%"
       v-if="selectUserWorkDialogVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"

src/views/basic/workplace/addCollectWorkplace.vue

@@ -235,6 +235,9 @@ export default {
     },
     chooseCollect() {
       let selectList = this.$refs.table.selection
+      if (selectList.length == 0){
+        return this.$message.error("请选择采集工位")
+      }
       let selecTypetList = selectList.map(item => item.documentTypeCode)
       let selecCollecttList = selectList.map(item => item.workplaceCode)
       let seleceBusId = selectList.map(item => item.id)
@@ -246,7 +249,7 @@ export default {
         if (res.code != 20000) {
           return this.$message.error(res.message)
         }
-        this.$message.success('绑定成功')
+        this.$message.success('选入成功')
         this.closeDialog()
       }).catch(() => {
 

src/views/basic/workplace/cargowWorkplaceManage.vue

@@ -506,6 +506,7 @@ export default {
       DeptList: [],
       list: [],
       collectList: [],
+      collectList1: [],
       collectAndTypeIds: [],
       users: [],
       busTypeTotal: 0,
@@ -793,9 +794,20 @@ export default {
       if (this.rowData.workplaceId == null) {
         return this.$message.error('请选择上货工位')
       }
-      this.collectWorks = this.collectList.map(item => item.collectAndTypeCodes)
+      this.cargowQuery.workPlaceCode = this.rowData.workplaceId
+      this.cargowQuery.limit = 1000
+      getBindCollectList(this.cargowQuery).then(res => {
+        if (res.code != 20000) {
+          return this.$message.error('获取失败')
+        }
+        this.collectList1 = res.data.list || []
+        this.collectWorks = this.collectList1.map(item => item.collectAndTypeCodes)
+        this.chooseCollectDialogVisible = true
+        this.cargowQuery.limit = 10
+      })
+
       // this.collectWorks = this.collectWorkPlaceCodes.concat(this.collectBusTypeCodes);
-      this.chooseCollectDialogVisible = true
+
     },
     removeCollect(row){
       this.$confirm('此操作将永久删除该采集工位, 是否继续?', '提示', {

src/views/basic/workplace/workplaceManage.vue

@@ -917,7 +917,7 @@ export default {
       groupData: null,
       total: 0,
       userTotal: 0,
-      workplaceName: '用户',
+      workplaceName: '采集工位',
       workplaceBusType: '工位',
       deptList: [],
       //单据类型数据
@@ -960,6 +960,7 @@ export default {
         deptCode: this.$store.getters.locDeptCode,
       }
       this.getList()
+      this.workplaceName = "采集工位"
       this.busTypeList = []
       this.userList = []
     },

src/views/collect/DealOrder.vue

@@ -1210,6 +1210,8 @@ export default {
       this.result = "";
       this.warnResult = ""
       this.errResult = ""
+      this.warnVisible = false
+      this.errVisible = false
     },
 
     /**

src/views/collect/IoCreateOrder.vue

@@ -134,29 +134,29 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="6" v-if="!isLinkDisabled">
-            <el-form-item prop="busType" class="query-form-item" label="业务名称:">
-              <el-select
-                v-model="orderFormData.busType"
-                placeholder="业务名称"
-                style="width: 90%"
-                :disabled="corpOrderIdDisabled"
-                filterable
-              >
-                <el-option
-                  v-for="item in busTypeList"
-                  :key="item.documentTypeCode"
-                  :label="item.busName"
-                  :value="item.documentTypeCode"
-                >
-                  <span style="float: left">{{ item.busName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                      item.documentTypeCode
-                    }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="6" v-if="!isLinkDisabled">-->
+          <!--  <el-form-item prop="busType" class="query-form-item" label="业务名称:">-->
+          <!--    <el-select-->
+          <!--      v-model="orderFormData.busType"-->
+          <!--      placeholder="业务名称"-->
+          <!--      style="width: 90%"-->
+          <!--      :disabled="corpOrderIdDisabled"-->
+          <!--      filterable-->
+          <!--    >-->
+          <!--      <el-option-->
+          <!--        v-for="item in busTypeList"-->
+          <!--        :key="item.documentTypeCode"-->
+          <!--        :label="item.busName"-->
+          <!--        :value="item.documentTypeCode"-->
+          <!--      >-->
+          <!--        <span style="float: left">{{ item.busName }}</span>-->
+          <!--        <span style="float: right; color: #8492a6; font-size: 13px">{{-->
+          <!--            item.documentTypeCode-->
+          <!--          }}</span>-->
+          <!--      </el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
 
           <!--<el-col :span="6" v-if="splitType=='out'">-->
           <!--  <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">-->

src/views/collect/selectCollectOrderDialog.vue

@@ -780,7 +780,7 @@ export default {
   created() {
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
-      // this.filterQuery.workPlaceCode = this.$route.query.workplaceId
+      this.filterQuery.workPlaceCode = this.$route.query.workplaceId
     }
     this.findWorkPlace(this, "");
     getHead("prescribeSelect", "1").then((re) => {