Merge remote-tracking branch 'origin/master'

src/views/basic/busType/bussinessTypeModify.vue

@@ -906,7 +906,7 @@
             </el-row>
           </div>
         </el-collapse-item>
-        <el-collapse-item title="是否人工审核据设置(二次审核)">
+        <el-collapse-item title="是否人工审核单据设置(二次审核)">
           <div>
             <div style="width: 100%;margin: 0 auto;margin-top: 20px">
               <el-row style="margin-bottom: 15px">
@@ -1226,7 +1226,6 @@ export default {
     },
 
     corpTypeChange(type) {
-      debugger
       if (type != 2) {
         this.inputQuery.genUnit = false
       }
@@ -1355,7 +1354,6 @@ export default {
     this.findSpecialMethod()
     this.selectBussinessList()
     this.oldData = Object.assign({}, this.inputQuery)
-    debugger
     if(this.inputQuery.id==null || this.inputQuery.id==''){
       this.inputQuery.codeFillCheck=false;
       this.inputQuery.preInBack=false;

src/views/basic/product/productUdiType.vue

@@ -284,7 +284,6 @@ export default {
 
     /** 查询菜单下拉树结构 */
     getTreeselect(row) {
-      debugger
       if(row!=null){
         var data={
           code:row.code,

src/views/inout/DialogSelectRl.vue

@@ -725,7 +725,6 @@ export default {
           mySupId: this.curRow.unitFk,
         };
         updateBind(query).then((response) => {
-          debugger
           if (response.code == 20000) {
             this.$message.success("绑定成功");
             this.closeBindDialog(this.curRow.id);

src/views/inout/PanelCreateOrderCodes.vue

@@ -289,7 +289,6 @@ export default {
         mySupId: row.unitFk,
       };
       updateCodeBindSup(query).then((response) => {
-        debugger
         if (response.code == 20000) {
           this.$message.success("绑定成功");
           // this.orderFormData.id = this.curRow.orderId;

src/views/inventory/inner/innerOrderEditDialog.vue

@@ -285,7 +285,7 @@ export default {
           this.selectedIndex = "";
         },
       stockOrderList(){
-          debugger
+
         if(this.query.id==null) {
           inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
             .then(response => {
@@ -308,7 +308,6 @@ export default {
         this.haveDistributionVisible = true;
       },
         selectProductFunction() {
-          debugger
           if(this.query.id==null) {
             inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
               .then(response => {

src/views/purchase/cert/supCertSearch.vue

@@ -629,7 +629,6 @@ export default {
             this.loading = true;
             verifyTemplateFile(query).then((res) => {
                 if (res.code === 20000) {
-                  debugger
                     //查询全部详情id
                     var supCertQuery={
                         customerId:row.customerId,
@@ -671,7 +670,6 @@ export default {
             let query = {id: 3};
             this.loading = true;
             verifyTemplateFile(query).then((res) => {
-              debugger
                 if (res.code === 20000) {
                     //查询全部详情id
                     var supCertQuery={

src/views/purchase/cert/supCertSetSelectDialog.vue

@@ -146,7 +146,7 @@ export default {
                 manufacturerIdFk: this.manufacturerId,
                 productIdFk: this.productId,
                 supCertSetEntities: this.multipleSelection,
-                customerId:this.$store.getters.customerId,
+                customerId:this.customerId,
             };
             selectAllCert(postQuery)
                 .then(response => {

src/views/system/param/systemParamConfig.vue

@@ -98,7 +98,7 @@
           <el-row>
             <el-form-item label="参数值" prop="paramValue" label-width="100px">
               <el-input
-                type=""
+                type="number"
                 v-model="formData.paramValue"
                 auto-complete="off"
                 style="width: 90%"
@@ -294,10 +294,6 @@ export default {
       }
     },
     formSubmit() {
-      // if (!Number.isInteger(parseInt(this.formData.paramValue))) {
-      //     this.$message.warning("参数值必须为数字");
-      //     return;
-      // }
       this.$refs["dataForm"].validate((valid) => {
         if (valid) {
           this.formLoading = true;