上锁

src/router/views/index.js

@@ -796,6 +796,21 @@ export default [{
     ]
   },
   {
+    path: '/basicData/facultyManagement/index',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/basicData/facultyManagement/index',
+        name:'教职工管理',
+        meta: {
+          keepAlive: true,
+        },
+        component: () => import( /* webpackChunkName: "views" */ '@/views/basicData/facultyManagement/index')
+      }
+    ]
+  },
+  {
     path: '/salaryManagement/primarySchool/index',
     component: Layout,
     hidden: true,

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1030,11 +1030,11 @@ export default {
       this.data[row.index].corpName = row.cname;
     },
     priceTermsChange(row) {
-      if(!this.form.priceTermsDescription){
-        if(row=='FOB'||row=='EXW'){
-          this.form.priceTermsDescription=this.form.portOfLoad
-        }else{
-          this.form.priceTermsDescription=this.form.portOfDestination
+      if (!this.form.priceTermsDescription) {
+        if (row == "FOB" || row == "EXW") {
+          this.form.priceTermsDescription = this.form.portOfLoad;
+        } else {
+          this.form.priceTermsDescription = this.form.portOfDestination;
         }
       }
     },
@@ -1861,8 +1861,22 @@ export default {
       return sums;
     },
     openEdit() {
+      // const data = {
+      //   // moduleName: "bj",
+      //   // tableName: "business_order",
+      //   billId: this.form.id,
+      //   no: localStorage.getItem('browserID')
+      // };
+      // this.saveLoading = true;
+      // this.checkLock(data).then(res => {
+      //   if (res.data.code == 200) {
+      //     this.onLock(data).then(response => {});
+      //     this.detailData.status = 2;
+      //     this.option = this.$options.data().option;
+      //   }
+      // });
       this.detailData.status = 2;
-      this.option = this.$options.data().option;
+          this.option = this.$options.data().option;
     },
     async saveColumn() {
       const inSave = await this.saveColumnData(

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1931,13 +1931,13 @@ export default {
               if (status == "goBack") {
                 this.$emit("goBack");
                 this.leaveDetailsKey(this.$route.name);
-              }
-              if (this.form.id) {
-                this.unLock({
-                  moduleName: "xs",
-                  tableName: "business_order",
-                  billId: this.form.id
-                });
+                if (this.form.id) {
+                  this.unLock({
+                    moduleName: "xs",
+                    tableName: "business_order",
+                    billId: this.form.id
+                  });
+                }
               }
             })
             .finally(() => {
@@ -2095,10 +2095,15 @@ export default {
         billId: this.form.id,
         no: localStorage.getItem("browserID")
       };
+      this.inDetailsKey(this.$route.name, {
+        moduleName: "xs",
+        tableName: "business_order",
+        id: this.form.id
+      });
       this.saveLoading = true;
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
-          this.onLock(data).then(response => {});
+          this.onLock(data);
           this.detailData.status = 2;
           this.option = this.$options.data().option;
         }

src/views/exportTrade/salesContract/index.vue

@@ -297,11 +297,6 @@ export default {
         status: status
       };
       this.show = false;
-      this.inDetailsKey(this.$route.name, {
-        moduleName: "xs",
-        tableName: "business_order",
-        id: row.id
-      });
     },
     //点击搜索按钮触发
     searchChange(params, done) {