修改bug

src/components/price-Library/configuration/mainList.json

@@ -1,6 +1,6 @@
 {
   "border": true,
-  "searchMenuSpan": 24,
+  "searchMenuSpan": 6,
   "index": true,
   "viewBtn": false,
   "editBtn": false,
@@ -22,7 +22,7 @@
       "label": "商品类别",
       "prop": "goodsTypeName",
       "search": true,
-      "searchSpan": 8,
+      "searchSpan": 6,
       "index": 2,
       "width": 100,
       "type": "select",
@@ -37,7 +37,7 @@
     {
       "label": "商品名称",
       "search": true,
-      "searchSpan": 8,
+      "searchSpan": 6,
       "prop": "cname",
       "index": 3,
       "width": 100,
@@ -46,7 +46,7 @@
     {
       "label": "英文名称",
       "search": true,
-      "searchSpan": 8,
+      "searchSpan": 6,
       "prop": "ename",
       "index": 3,
       "width": 100,

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1939,7 +1939,6 @@ export default {
         billId: this.form.id,
         billNo: this.form.orgOrderNo
       });
-      this.saveLoading = true;
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
           this.onLock(data);

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -962,7 +962,16 @@ export default {
               this.$message.success("保存成功");
               this.getDetail(res.data.data);
               if (status == "goBack") {
+                if (this.form.id) {
+                  this.unLock({
+                    moduleName: "xs",
+                    tableName: "business_order",
+                    billId: this.form.id,
+                    billNo: this.form.orgOrderNo
+                  });
+                }
                 this.$emit("goBack");
+                this.leaveDetailsKey(this.$route.name);
               }
             })
             .finally(() => {
@@ -1040,10 +1049,28 @@ export default {
             this.editCustomer("goBack");
           })
           .catch(() => {
+            if (this.form.id) {
+              this.unLock({
+                moduleName: "cg",
+                tableName: "business_order",
+                billId: this.form.id,
+                billNo: this.form.orgOrderNo
+              });
+            }
             this.$emit("goBack");
+            this.leaveDetailsKey(this.$route.name);
           });
       } else {
+        if (this.form.id) {
+          this.unLock({
+            moduleName: "cg",
+            tableName: "business_order",
+            billId: this.form.id,
+            billNo: this.form.orgOrderNo
+          });
+        }
         this.$emit("goBack");
+        this.leaveDetailsKey(this.$route.name);
       }
     },
     openReport() {
@@ -1152,8 +1179,27 @@ export default {
       callback(params);
     },
     openEdit() {
-      this.detailData.status = 2;
-      this.option = this.$options.data().option;
+      const data = {
+        moduleName: "cg",
+        tableName: "business_order",
+        billId: this.form.id,
+        no: localStorage.getItem("browserID"),
+        billNo: this.form.orgOrderNo
+      };
+      this.inDetailsKey(this.$route.name, {
+        moduleName: "cg",
+        tableName: "business_order",
+        billId: this.form.id,
+        billNo: this.form.orgOrderNo
+      });
+      this.saveLoading = true;
+      this.checkLock(data).then(res => {
+        if (res.data.code == 200) {
+          this.onLock(data);
+          this.detailData.status = 2;
+          this.option = this.$options.data().option;
+        }
+      });
     },
     async saveColumn() {
       const inSave = await this.saveColumnData(

src/views/exportTrade/salesContract/detailsPage.vue

@@ -2158,7 +2158,6 @@ export default {
         billId: this.form.id,
         billNo: this.form.orgOrderNo
       });
-      this.saveLoading = true;
       this.checkLock(data).then(res => {
         if (res.data.code == 200) {
           this.onLock(data);

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -96,6 +96,14 @@
               :disabled="detailData.status == 1"
               >导出
             </el-button>
+            <el-button
+              type="info"
+              icon="el-icon-printer"
+              size="small"
+              :disabled="!form.id"
+              @click.stop="openReport()"
+              >报 表</el-button
+            >
           </template>
           <template slot="basicsSalaryLabel">
             <el-tag>基础工资:</el-tag>
@@ -651,6 +659,7 @@
             v-model="excelForm"
             table-loading="excelLoading"
             :upload-after="uploadAfter"
+            class="schoolupload"
           >
             <template slot="excelTemplate">
               <el-button type="primary" @click="derivation">
@@ -687,6 +696,12 @@
           </template>
         </avue-crud>
       </basic-container>
+      <report-dialog
+        :switchDialog="switchDialog"
+        :reportId="form.id"
+        reportName="小学部"
+        @onClose="onClose()"
+      ></report-dialog>
     </div>
   </div>
 </template>
@@ -703,10 +718,12 @@ import {
 } from "@/api/salaryManagement/primarySchool";
 import { numCal } from "@/util/calculate";
 import { optionList } from "./js/optionList";
+import reportDialog from "@/components/report-dialog/main";
 export default {
   name: "detailsPage",
   data() {
     return {
+      switchDialog: false,
       annexLoading: false,
       crudForm: {},
       excelBox: false,
@@ -956,6 +973,9 @@ export default {
       type: Object
     }
   },
+  components: {
+    reportDialog
+  },
   created() {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
@@ -964,6 +984,7 @@ export default {
       this.option.disabled = true;
     }
     this.optionList.height = window.innerHeight - 500;
+    this.annexOption.height = window.innerHeight - 500;
   },
   methods: {
     cellStyle() {
@@ -1124,6 +1145,10 @@ export default {
       window.open(`${row.url}?${this.website.tokenHeader}=${getToken()}`);
     },
     searchChange(params, done) {
+      if (!this.form.id) {
+        done();
+        return this.$message.error("请保存数据");
+      }
       this.getItemDetail();
       done();
     },
@@ -1397,6 +1422,12 @@ export default {
         }
       });
     },
+    openReport() {
+      this.switchDialog = !this.switchDialog;
+    },
+    onClose(val) {
+      this.switchDialog = val;
+    },
     // 请核
     pleaseCheck() {
       this.$confirm("您确定提交此次申请吗？", {
@@ -1590,6 +1621,16 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "18":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/eomNumberExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/eomNumberExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           case "19":
             this.exportUrl = "/api/blade-school/salaryitem/export/payTaxes";
             this.findObject(this.excelOption.column, "excelFile").action =
@@ -1667,16 +1708,6 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
-          case "27":
-            this.exportUrl =
-              "/api/blade-school/salaryitem/export/eomNumberExcel";
-            this.findObject(this.excelOption.column, "excelFile").action =
-              "/api/blade-school/salaryitem/import/eomNumberExcel";
-            this.findObject(
-              this.excelOption.column,
-              "excelFile"
-            ).disabled = false;
-            break;
           case "28":
             this.exportUrl =
               "/api/blade-school/salaryitem/export/teachingExcel";
@@ -1715,4 +1746,7 @@ export default {
 ::v-deep .el-form-item__error {
   display: none !important;
 }
+.schoolupload ::v-deep .el-upload-list {
+  display: none;
+}
 </style>