界面修改

src/views/basic/workplace/addBusTypeDialog.vue

@@ -76,7 +76,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" class="el-col">
-          <el-form-item label="业务类型是否常用:" prop="isPopular" class="query-form-item">
+          <el-form-item label="常用业务类型:" prop="isPopular" class="query-form-item">
             <el-select v-model="formData.isPopular" style="width: 80%" placeholder="业务类型是否常用">
               <el-option label="是" :value="1"></el-option>
               <el-option label="否" :value="0"></el-option>
@@ -85,17 +85,17 @@
         </el-col>
       </el-row>
 
-        <el-divider></el-divider>
-        <!--<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="作业类型">-->
-        <!--      <el-option label="全部" :value="3"></el-option>-->
-        <!--      <el-option label="拆零" :value="1"></el-option>-->
-        <!--      <el-option label="取整" :value="2"></el-option>-->
+      <el-divider></el-divider>
+      <!--<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="作业类型">-->
+      <!--      <el-option label="全部" :value="3"></el-option>-->
+      <!--      <el-option label="拆零" :value="1"></el-option>-->
+      <!--      <el-option label="取整" :value="2"></el-option>-->
 
-        <!--    </el-select>-->
-        <!--  </el-form-item>-->
-        <!--</el-col>-->
+      <!--    </el-select>-->
+      <!--  </el-form-item>-->
+      <!--</el-col>-->
       <el-row :gutter="24" class="el-row">
         <el-col :span="12" class="el-col">
           <el-form-item label="扫码方式:" prop="scanType" class="query-form-item">
@@ -110,7 +110,7 @@
         </el-col>
         <el-col :span="12" class="el-col">
           <el-form-item label="单据完成条件:" prop="monopoly" class="query-form-item" v-if="formData.scanType != 1">
-            <el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成条件" >
+            <el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成条件">
               <el-option label="完全赋码" :value="0"></el-option>
               <el-option label="部分赋码" :value="1"></el-option>
               <el-option label="赋码超出" :value="2"></el-option>
@@ -137,6 +137,10 @@
             </el-select>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-divider></el-divider>
+      <el-row :gutter="24" class="el-row">
         <el-col :span="12" class="el-col">
           <el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">
             <el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型"
@@ -405,33 +409,33 @@ export default {
     ,
     formSubmit() {
       this.formData.workplaceCode = this.workplaceId
-      if (this.formData.scanType == 1){
+      if (this.formData.scanType == 1) {
         this.formData.orderFinishVerify = null
       }
-        this.$refs['dataForm'].validate((rules) => {
-          if (rules) {
-            if (this.upData != null){
-              updateType(this.formData).then(res => {
-                if (res.code == 20000) {
-                  this.closeDialog()
-                  this.$message.success('更新成功')
-                } else {
-                  this.$message.error('更新失败')
-                }
-              })
-            }else {
-              addBusType(this.formData).then(res => {
-                if (res.code == 20000) {
-                  this.$message.success('新增成功')
-                  this.closeDialog()
-                } else {
-                  this.$message.error('新增失败')
-                }
-              })
-            }
+      this.$refs['dataForm'].validate((rules) => {
+        if (rules) {
+          if (this.upData != null) {
+            updateType(this.formData).then(res => {
+              if (res.code == 20000) {
+                this.closeDialog()
+                this.$message.success('更新成功')
+              } else {
+                this.$message.error('更新失败')
+              }
+            })
+          } else {
+            addBusType(this.formData).then(res => {
+              if (res.code == 20000) {
+                this.$message.success('新增成功')
+                this.closeDialog()
+              } else {
+                this.$message.error('新增失败')
+              }
+            })
           }
+        }
 
-        })
+      })
     },
     hideForm() {
       this.closeDialog()
@@ -470,7 +474,7 @@ export default {
     if (this.upData != null) {
       console.log(this.upData)
       this.formData = this.upData
-      if (this.formData.invCode != 0){
+      if (this.formData.invCode != 0) {
         this.formData.invCode = this.upData.invCode + ''
       }
       if (this.formData.invCode == 0) {

src/views/collect/DealOrder.vue

@@ -445,7 +445,7 @@ export default {
       busTypeTotal: 0,
 
       invList: [],
-      viewType:1
+      viewType: 1
     }
   },
 

src/views/collect/selectCollectOrderDialog.vue

@@ -292,7 +292,7 @@ export default {
         billNo: null,
         page: 1,
         limit: 10,
-        tagStatusList: [0,1,2,4,-1], // 0:原始单据未处理，1:已分配工位待处理；2：处理中；4：处理异常,-1:草稿，挂起状态
+        tagStatusList: [0,1,-1], // 0:原始单据未处理，1:已分配工位待处理；2：处理中；4：处理异常,-1:草稿，挂起状态
         // invAlerts:[0,1]
       },
       defaultSort: {prop: 'createTime', order: 'desc'},