优化 1.0

src/views/basic/collectPoint/gatherOrderType.vue

@@ -79,6 +79,7 @@
               <el-form-item label="单据类型编号:" prop="code" class="query-form-item">
                 <el-input
                   placeholder="请输入单据类型编号"
+                  disabled
                   v-model="formData.code" style="width: 80%"
                   auto-complete="off"
                 ></el-input>
@@ -185,6 +186,7 @@ export default {
       },
       addCollectionPointsDialogVisible: false,
       formData: {},
+      code: '',
       total: 0,
       busTypes: [],
       formRules: {
@@ -241,9 +243,14 @@ export default {
       this.getList()
     },
     addCollectionPoints() {
-      this.formData = {}
       this.fromName = 'add'
+      genCode().then(res => {
+        if (res.code == 20000){
+          this.code = res.data
+          this.formData.code = res.data
           this.addCollectionPointsDialogVisible = true
+        }
+      })
     },
     getList() {
       this.loading = true
@@ -333,6 +340,7 @@ export default {
   created() {
     this.getList()
     this.getBusType()
+
   }
 
 }

src/views/basic/workplace/workplaceManage.vue

@@ -67,7 +67,6 @@
         </el-button>
 
 
-
         <el-col style="border-left: 3px solid #dddddd; overflow-y: hidden">
           <el-card>
             <el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
@@ -167,7 +166,7 @@
             </pagination>
           </el-card>
           <el-card>
-            <div>{{workplaceName}}-用户列表</div>
+            <div>{{ workplaceName }}-用户列表</div>
 
             <el-form :inline="true" :model="userQuery" class="query-form" size="mini"
                      style="margin-top: 30px;margin-bottom: 10px"
@@ -284,7 +283,7 @@
 
           <el-col :span="12" class="el-col">
             <el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
-              <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式" clearable>
+              <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式" clearable disabled>
                 <el-option label="不插入" :value="1"></el-option>
                 <el-option label="插入" :value="2"></el-option>
               </el-select>
@@ -515,7 +514,9 @@ export default {
         'add': '新增工位',
         'edit': '编辑工位'
       },
-      formData: {},
+      formData: {
+        operationType: 1
+      },
       workplaceCode: '6001',
       unitStorageList: [],
       invList: [],
@@ -536,6 +537,9 @@ export default {
         ],
         invCode: [
           { required: true, message: '请选择仓库', trigger: 'blur' }
+        ],
+        constituencies: [
+          { required: true, message: '请选择所属组别', trigger: 'blur' }
         ]
       },
       invQuery: {
@@ -580,16 +584,14 @@ export default {
       workplaceName: '用户'
     }
   },
-  computed: {
+  computed: {},
-
-  },
   methods: {
     hideSearch() {
       this.showSearch = !this.showSearch
     },
     onSubmit() {
       this.userList = []
-      this.rowData.workplaceName = "工位"
+      this.rowData.workplaceName = '工位'
       this.query.page = 1
       this.getList()
     },
@@ -618,9 +620,14 @@ export default {
         if (res.code == 20000) {
           if (res.data == null) {
             this.formData.workplaceId = this.workplaceCode + 1001
+            this.formData.operationType = 1
+            this.formData.checkInsert = 2
             this.addWorkplaceDialogVisible = true
           } else {
-            this.formData = {}
+            this.formData = {
+              operationType: 1,
+              checkInsert: 2
+            }
             this.formData.workplaceId = res.data
             this.addWorkplaceDialogVisible = true
           }
@@ -660,12 +667,12 @@ export default {
             this.$message.error('请完善必填信息')
           } else {
             addWorkplace(this.formData).then(res => {
-              console.log("res",res)
+              console.log('res', res)
               if (res.code != 20000) {
                 return this.$message.error('新增错误')
               }
               this.addWorkplaceDialogVisible = false
-              this.$message.success("新增成功")
+              this.$message.success('新增成功')
               // this.query.code = this.groupData.code
               // if (this.query.code == 1001) {
               //   this.query.code = null
@@ -883,19 +890,19 @@ export default {
       })
     },
     forInvSubmit() {
-      if (this.formName === 'edit'){
+      if (this.formName === 'edit') {
         updateTree(this.subData).then(res => {
-          if (res.code == 20000){
+          if (res.code == 20000) {
             this.subFormVisible = false
             this.getLstTree()
             this.$message.success('成功')
-          }else {
+          } else {
             this.$message.error(res.message)
           }
         }).catch(() => {
 
         })
-      }else {
+      } else {
         addTree(this.subData).then(res => {
           if (res.code == 20000) {
             this.subFormVisible = false