Merge remote-tracking branch 'origin/dev' into dev

src/util/contrastData.js

@@ -3,7 +3,6 @@ export function contrastObj(newval, oldval) {
   let reg = /^[A-Za-z]+$/;
   for (let key in newval) {
     if (reg.test(key)&&!(newval[key] instanceof Array) && (newval[key] != oldval[key] && (newval[key] || oldval[key]))) {
-      console.log(newval[key])
       return true
     }
   }

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1779,7 +1779,7 @@ export default {
                       moduleName: "bj",
                       tableName: "business_order",
                       billId: this.form.id,
-                      billNo: this.form.orgOrderNo,
+                      billNo: this.form.orgOrderNo
                     });
                   }
                   this.$emit("goBack");
@@ -1817,7 +1817,7 @@ export default {
                 moduleName: "bj",
                 tableName: "business_order",
                 billId: this.form.id,
-                billNo: this.form.orgOrderNo,
+                billNo: this.form.orgOrderNo
               });
             }
             this.$emit("goBack");
@@ -1829,7 +1829,7 @@ export default {
             moduleName: "bj",
             tableName: "business_order",
             billId: this.form.id,
-            billNo: this.form.orgOrderNo,
+            billNo: this.form.orgOrderNo
           });
         }
         this.$emit("goBack");
@@ -1893,13 +1893,13 @@ export default {
         tableName: "business_order",
         billId: this.form.id,
         no: localStorage.getItem("browserID"),
-        billNo: this.form.orgOrderNo,
+        billNo: this.form.orgOrderNo
       };
       this.inDetailsKey(this.$route.name, {
         moduleName: "bj",
         tableName: "business_order",
         billId: this.form.id,
-        billNo: this.form.orgOrderNo,
+        billNo: this.form.orgOrderNo
       });
       this.saveLoading = true;
       this.checkLock(data).then(res => {

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1934,7 +1934,7 @@ export default {
                     moduleName: "xs",
                     tableName: "business_order",
                     billId: this.form.id,
-                    billNo: this.form.orgOrderNo,
+                    billNo: this.form.orgOrderNo
                   });
                 }
                 this.$emit("goBack");
@@ -2021,7 +2021,7 @@ export default {
                 moduleName: "xs",
                 tableName: "business_order",
                 billId: this.form.id,
-                billNo: this.form.orgOrderNo,
+                billNo: this.form.orgOrderNo
               });
             }
             this.$emit("goBack");
@@ -2033,7 +2033,7 @@ export default {
             moduleName: "xs",
             tableName: "business_order",
             billId: this.form.id,
-            billNo: this.form.orgOrderNo,
+            billNo: this.form.orgOrderNo
           });
         }
         this.$emit("goBack");
@@ -2111,13 +2111,13 @@ export default {
         tableName: "business_order",
         billId: this.form.id,
         no: localStorage.getItem("browserID"),
-        billNo: this.form.orgOrderNo,
+        billNo: this.form.orgOrderNo
       };
       this.inDetailsKey(this.$route.name, {
         moduleName: "xs",
         tableName: "business_order",
         billId: this.form.id,
-        billNo: this.form.orgOrderNo,
+        billNo: this.form.orgOrderNo
       });
       this.saveLoading = true;
       this.checkLock(data).then(res => {

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -10,14 +10,24 @@
           >返回列表
         </el-button>
       </div>
-      <el-button
-        class="el-button--small-yh add-customer-btn"
-        type="primary"
-        :disabled="loadingBtn"
-        size="small"
-        @click="editCustomer"
-        >保存数据
-      </el-button>
+      <div class="add-customer-btn">
+        <el-button
+          type="primary"
+          size="small"
+          v-if="detailData.status == 1"
+          class="el-button--small-yh "
+          @click.stop="openEdit"
+          >编辑
+        </el-button>
+        <el-button
+          class="el-button--small-yh"
+          type="primary"
+          :disabled="loadingBtn || detailData.status == 1"
+          size="small"
+          @click="editCustomer"
+          >保存数据
+        </el-button>
+      </div>
     </div>
     <div class="customer-main">
       <containerTitle title="基础资料"></containerTitle>
@@ -54,12 +64,21 @@
               type="primary"
               @click.stop="$refs.crud.rowAdd()"
               size="small"
+              :disabled="detailData.status == 1"
               >新增</el-button
             >
-            <el-button type="primary" size="small" @click="importExcel()"
+            <el-button
+              type="primary"
+              size="small"
+              @click="importExcel()"
+              :disabled="detailData.status == 1"
               >导入
             </el-button>
-            <el-button type="primary" size="small" @click.stop="openExport()"
+            <el-button
+              type="primary"
+              size="small"
+              @click.stop="openExport()"
+              :disabled="detailData.status == 1"
               >导出
             </el-button>
           </template>
@@ -579,6 +598,7 @@
               type="text"
               size="small"
               @click.stop="$refs.crud.rowEdit(row, index)"
+              :disabled="detailData.status == 1"
             >
               {{ row.$cellEdit ? "保存" : "编辑" }}
             </el-button>
@@ -586,6 +606,7 @@
               type="text"
               size="small"
               @click.stop="rowDel(row, index)"
+              :disabled="detailData.status == 1"
             >
               删除
             </el-button>
@@ -795,10 +816,9 @@ export default {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
-    // if (this.detailData.status == 1) {
-    //   this.option.disabled = true;
-    //   this.findObject(this.optionList.column, "cname").search = true;
-    // }
+    if (this.detailData.status == 1) {
+      this.option.disabled = true;
+    }
     this.optionList.height = window.innerHeight - 400;
   },
   methods: {
@@ -1178,9 +1198,40 @@ export default {
         data: opt.data
       });
     },
+    openEdit() {
+      const data = {
+        moduleName: "xxb",
+        tableName: "primary_school",
+        billId: this.form.id,
+        no: localStorage.getItem("browserID"),
+        billNo: this.form.annual + "-" + this.form.moon
+      };
+      this.inDetailsKey(this.$route.name, {
+        moduleName: "xxb",
+        tableName: "primary_school",
+        billId: this.form.id,
+        billNo: this.form.annual + "-" + this.form.moon
+      });
+      this.checkLock(data).then(res => {
+        if (res.data.code == 200) {
+          this.onLock(data);
+          this.detailData.status = 2;
+          this.option = this.$options.data().option;
+        }
+      });
+    },
     //返回列表
     backToList() {
+      if (this.form.id) {
+        this.unLock({
+          moduleName: "xxb",
+          tableName: "primary_school",
+          billId: this.form.id,
+          billNo: this.form.annual + "-" + this.form.moon
+        });
+      }
       this.$emit("goBack");
+      this.leaveDetailsKey(this.$route.name);
     }
   },
   watch: {

src/views/salaryManagement/primarySchool/index.vue

@@ -25,7 +25,7 @@
           <el-button type="text" size="small" @click.stop="editOpen(row, 1)">
             查看
           </el-button>
-          <el-button type="text" size="small" @click.stop="editOpen(row, 2)">
+          <el-button type="text" size="small" @click.stop="editOpen(row, 1)">
             编辑
           </el-button>
           <el-button type="text" size="small" @click.stop="rowDel(row, index)">

src/views/system/lock/index.vue

@@ -98,6 +98,10 @@ export default {
           label: '销项',
           value: 'xx'
         },
+        {
+          label: '小学部',
+          value: 'xxb'
+        },
       ]
     }
   },

src/views/wel/components/quick-launch.vue

@@ -7,87 +7,87 @@
         </span>
       </div>
       <div class="content" v-if="sysType == 3">
-        <div class="content-icon"  @click="inPage('cg')">
+        <div class="content-icon" @click="inPage('cg')">
           <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
           <span>采购</span>
         </div>
-        <div class="content-icon"  @click="inPage('xs')">
+        <div class="content-icon" @click="inPage('xs')">
           <i class="tradingIcon icon-sales" style="color:#409EFF"></i>
           <span>销售</span>
         </div>
-        <div class="content-icon"  @click="inPage('sh')">
+        <div class="content-icon" @click="inPage('sh')">
           <i class="tradingIcon icon-receipt" style="color:#921939"></i>
           <span>收货</span>
         </div>
-        <div class="content-icon"  @click="inPage('fh')">
+        <div class="content-icon" @click="inPage('fh')">
           <i class="tradingIcon icon-ship" style="color:#143056"></i>
           <span>发货</span>
         </div>
-        <div class="content-icon"  @click="inPage('sqfk')">
+        <div class="content-icon" @click="inPage('sqfk')">
           <i class="tradingIcon icon-apply" style="color:#BE3216"></i>
           <span>申请付款</span>
         </div>
-        <div class="content-icon"  @click="inPage('ff')">
+        <div class="content-icon" @click="inPage('ff')">
           <i class="tradingIcon icon-pay" style="color:#7E8270"></i>
           <span>付费</span>
         </div>
-        <div class="content-icon"  @click="inPage('sf')">
+        <div class="content-icon" @click="inPage('sf')">
           <i class="tradingIcon icon-charge" style="color:#4D6016"></i>
           <span>收费</span>
         </div>
       </div>
       <div class="content" v-if="sysType == 5">
-        <div class="content-icon"  @click="inPage('zy')">
+        <div class="content-icon" @click="inPage('zy')">
           <i class="tradingIcon icon-pay" style="color:#57927a"></i>
           <span>主营业务</span>
         </div>
-        <div class="content-icon"  @click="inPage('yf')">
+        <div class="content-icon" @click="inPage('yf')">
           <i class="tradingIcon icon-pay" style="color:#576892"></i>
           <span>业绩分析</span>
         </div>
-        <div class="content-icon"  @click="inPage('tj')">
+        <div class="content-icon" @click="inPage('tj')">
           <i class="tradingIcon icon-pay" style="color:#57927a"></i>
           <span>统计列表</span>
         </div>
-        <div class="content-icon"  @click="inPage('fw')">
+        <div class="content-icon" @click="inPage('fw')">
           <i class="tradingIcon icon-pay" style="color:#576892"></i>
           <span>服务项目</span>
         </div>
-        <div class="content-icon"  @click="inPage('sp')">
+        <div class="content-icon" @click="inPage('sp')">
           <i class="tradingIcon icon-pay" style="color:#57927a"></i>
           <span>商品信息</span>
         </div>
-        <div class="content-icon"  @click="inPage('fy')">
+        <div class="content-icon" @click="inPage('fy')">
           <i class="tradingIcon icon-pay" style="color:#576892"></i>
           <span>费用详情</span>
         </div>
       </div>
-      <div class="content" v-if="sysType == 4 || sysType == 2 ">
-        <div class="content-icon"  @click="inPage('xs')">
+      <div class="content" v-if="sysType == 4 || sysType == 2">
+        <div class="content-icon" @click="inPage('xs')">
           <i class="tradingIcon icon-sales" style="color:#409EFF"></i>
           <span>销售</span>
         </div>
-        <div class="content-icon"  @click="inPage('cg')">
+        <div class="content-icon" @click="inPage('cg')">
           <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
           <span>采购</span>
         </div>
-        <div class="content-icon"  @click="inPage('fh')">
+        <div class="content-icon" @click="inPage('fh')">
           <i class="tradingIcon icon-ship" style="color:#143056"></i>
           <span>发货</span>
         </div>
-        <div class="content-icon"  @click="inPage('sh')">
+        <div class="content-icon" @click="inPage('sh')">
           <i class="tradingIcon icon-receipt" style="color:#921939"></i>
           <span>收货</span>
         </div>
-        <div class="content-icon"  @click="inPage('sqfk')">
+        <div class="content-icon" @click="inPage('sqfk')">
           <i class="tradingIcon icon-apply" style="color:#BE3216"></i>
           <span>付费申请</span>
         </div>
-        <div class="content-icon"  @click="inPage('sf')">
+        <div class="content-icon" @click="inPage('sf')">
           <i class="tradingIcon icon-charge" style="color:#4D6016"></i>
           <span>收费</span>
         </div>
-        <div class="content-icon"  @click="inPage('ff')">
+        <div class="content-icon" @click="inPage('ff')">
           <i class="tradingIcon icon-pay" style="color:#7E8270"></i>
           <span>付费</span>
         </div>
@@ -164,7 +164,7 @@ export default {
             );
             break;
         }
-      }else if (this.sysType == 3) {
+      } else if (this.sysType == 3) {
         switch (type) {
           case "xs":
             this.$router.push("/salesManagement/salesContract/index");
@@ -192,7 +192,7 @@ export default {
             );
             break;
         }
-      }else if (this.sysType == 5) {
+      } else if (this.sysType == 5) {
         switch (type) {
           case "zy":
             this.$router.push("/workManagement/main-items/list");
@@ -214,7 +214,6 @@ export default {
             break;
         }
       }
-
     }
   }
 };