Merge remote-tracking branch 'origin/dev2.0' into dev2.0

src/views/basic/busType/bussinessType.vue

@@ -47,13 +47,13 @@
           <el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增</el-button>
           <el-button type="primary" icon="el-icon-download" @click="exportJsonFile">导出单据类型</el-button>
           <el-upload
-            :action="uploadFileUrl"
-            multiple
-            :limit="3"
-            :headers="headers"
-            :show-file-list="false"
-            :on-success="handleChange"
-            :file-list="fileList"
+              :action="uploadFileUrl"
+              multiple
+              :limit="3"
+              :headers="headers"
+              :show-file-list="false"
+              :on-success="handleChange"
+              :file-list="fileList"
           >
             <el-button icon="el-icon-upload2" type="primary">导入单据类型</el-button>
           </el-upload>
@@ -93,15 +93,15 @@
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
-              type="text"
-              @click.native.stop="handleModifyClick(scope.row)"
+                type="text"
+                @click.native.stop="handleModifyClick(scope.row)"
             >编辑
             </el-button
             >
             <el-button
-              type="text"
-              :disabled="!configParams.typeScan"
-              @click.native.stop="deleteDialog(scope.row)"
+                type="text"
+                :disabled="!configParams.typeScan"
+                @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button
             >
@@ -111,14 +111,14 @@
       </el-table>
 
       <el-dialog
-        title="新增扫码单据类型"
-        :visible.sync="addDialogVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="addDialogVisible"
-        class="dialog-two"
-        width="60%"
-        top="5vh"
+          title="新增扫码单据类型"
+          :visible.sync="addDialogVisible"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="addDialogVisible"
+          class="dialog-two"
+          width="60%"
+          top="5vh"
       >
         <modifyDialog :inputQuery="inputQuery"></modifyDialog>
         <div slot="footer" class="dialog-footer">
@@ -136,13 +136,13 @@
       </el-dialog>
 
       <el-dialog
-        title="编辑单据类型"
-        :visible.sync="modifyDialogVisible"
-        width="70%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="modifyDialogVisible"
-        :before-close="cancelDialog"
+          title="编辑单据类型"
+          :visible.sync="modifyDialogVisible"
+          width="70%"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="modifyDialogVisible"
+          :before-close="cancelDialog"
       >
         <modifyDialog :inputQuery="inputQuery" :modifySubmit="onModifySubmit"></modifyDialog>
         <div style="text-align: center;margin-top: 12px">
@@ -159,11 +159,11 @@
       </el-dialog>
 
       <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="getList"
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="getList"
       ></pagination>
     </el-card>
   </div>
@@ -208,6 +208,7 @@ export default {
         checkPdaUn: null,
         checkPc: null,
         checkWebNew: null,
+        checkWebNewType: null,
         checkChange: null,
         checkCopy: null,
         secCheckUdims: null,
@@ -316,20 +317,20 @@ export default {
     getList() {
       this.loading = true
       getBusTypeList(this.filterQuery)
-        .then((response) => {
-          if (response.code === 20000) {
-            this.list = response.data.list || []
-            this.total = response.data.total || 0
-          } else {
-            this.$message.error(response.message)
-          }
-          this.loading = false
-        })
-        .catch(() => {
-          this.loading = false
-          this.list = []
-          this.total = 0
-        })
+          .then((response) => {
+            if (response.code === 20000) {
+              this.list = response.data.list || []
+              this.total = response.data.total || 0
+            } else {
+              this.$message.error(response.message)
+            }
+            this.loading = false
+          })
+          .catch(() => {
+            this.loading = false
+            this.list = []
+            this.total = 0
+          })
     },
     handleCurrentChange(val) {
       this.filterQuery.page = val
@@ -392,18 +393,18 @@ export default {
       //   return;
       // }
       insertBusType(this.inputQuery)
-        .then((response) => {
-          if (response.code == 20000) {
+          .then((response) => {
+            if (response.code == 20000) {
+              this.loading = false
+              this.cancelDialog()
+              this.getList()
+            } else {
+              this.$message.error(response.message)
+            }
+          })
+          .catch(() => {
             this.loading = false
-            this.cancelDialog()
-            this.getList()
-          } else {
-            this.$message.error(response.message)
-          }
-        })
-        .catch(() => {
-          this.loading = false
-        });
+          });
     },
 
     onModifySubmit() {
@@ -438,26 +439,26 @@ export default {
       // }
 
       updateBusType(this.inputQuery)
-        .then((response) => {
-          if (response.code == 20000) {
+          .then((response) => {
+            if (response.code == 20000) {
+              this.loading = false
+              this.cancelDialog()
+              this.getList()
+            } else {
+              this.$message.error(response.message)
+            }
+          })
+          .catch(() => {
             this.loading = false
             this.cancelDialog()
-            this.getList()
-          } else {
-            this.$message.error(response.message)
-          }
-        })
-        .catch(() => {
-          this.loading = false
-          this.cancelDialog()
-        })
+          })
     },
     exportJsonFile() {
       exportFile().then((response) => {
         const binaryData = []
         binaryData.push(response)
         let url = window.URL.createObjectURL(
-          new Blob(binaryData, {type: 'application/json'})
+            new Blob(binaryData, {type: 'application/json'})
         )
         this.loading = false
         const eleLink = document.createElement('a')
@@ -492,6 +493,7 @@ export default {
         checkPdaUn: null,
         checkPc: null,
         checkWebNew: null,
+        checkWebNewType:null,
         checkChange: null,
         checkCopy: null,
         secCheckUdims: null,
@@ -566,11 +568,11 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       })
-        .then(() => {
-          this.deleteOrders(rowId)
-        })
-        .catch(() => {
-        })
+          .then(() => {
+            this.deleteOrders(rowId)
+          })
+          .catch(() => {
+          })
     },
 
     deleteOrders(data) {
@@ -579,20 +581,20 @@ export default {
         id: data.id + ''
       }
       deleteBusType(tquery)
-        .then((response) => {
-          this.getList()
-          if (response.code == 20000) {
-            this.$message({
-              type: 'success',
-              message: '删除成功！'
-            })
-          } else {
-            this.$message.error(response.message)
-          }
+          .then((response) => {
+            this.getList()
+            if (response.code == 20000) {
+              this.$message({
+                type: 'success',
+                message: '删除成功！'
+              })
+            } else {
+              this.$message.error(response.message)
+            }
 
-        })
-        .catch(() => {
-        })
+          })
+          .catch(() => {
+          })
     },
     handleChange(response, files, fileList) {
       if (response.code != 20000) {
@@ -611,13 +613,13 @@ export default {
     },
     getSyncConfig() {
       findConfig()
-        .then((response) => {
-          if (response.code == 20000) {
-            this.configParams = response.data
-          }
-        })
-        .catch(() => {
-        })
+          .then((response) => {
+            if (response.code == 20000) {
+              this.configParams = response.data
+            }
+          })
+          .catch(() => {
+          })
     }
   },
   components: {

src/views/basic/busType/bussinessTypeModify.vue

@@ -556,7 +556,6 @@
                   <el-option label="有三期业务单配/拣货" :value="1"></el-option>
                   <el-option label="无三期业务单配/拣货" :value="2"></el-option>
                   <el-option label="有三期业务单校验" :value="3"></el-option>
-
                 </el-select>
               </el-col>
               <el-divider direction="vertical"></el-divider>
@@ -565,6 +564,25 @@
               </el-col>
             </el-row>
             <el-divider></el-divider>
+            <el-row v-if="inputQuery.checkWebNew == 3">
+              <el-col span="5">
+                <span class="sptext">有三期业务单校验方式</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="inputQuery.checkWebNewType" style="width: 75%" :disabled="!inputQuery.checkEnable"
+                           placeholder="有三期业务单校验方式"
+                >
+                  <el-option label="扫码结果提交" :value="0"></el-option>
+                  <el-option label="比对结果提交" :value="1"></el-option>
+                </el-select>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">有三期业务单校验方式</span>
+              </el-col>
+            </el-row>
+            <el-divider v-if="inputQuery.checkWebNew == 3"></el-divider>
 
             <el-row>
               <el-col span="5">