Merge remote-tracking branch 'origin/main'

src/views/inspection/inspectionobject.vue

@@ -413,7 +413,7 @@
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          expUtil.excelExport(`/api/inspection/inspectionobject/export?daf-auth=${getToken()}`, this.search, ['stations', "istatus", "objectName"]);
+          expUtil.excelExportEasy(`/api/inspection/inspectionobject/export?daf-auth=${getToken()}`, this.search);
         });
       },
       beforeOpen(done, type) {

src/views/inspection/inspectionobjectDetail.vue

@@ -48,7 +48,7 @@ export default {
             label: "对象编号",
             prop: "objectNo",
             span:8,
-            disabled: true,
+            disabled:true,
             rules: [{
               required: true,
               message: "请输入对象编号",
@@ -102,8 +102,6 @@ export default {
                     kksNo.disabled = true;
                     if(["view"].includes(this.$route.query.frameMode)) {
                       kksNo.disabled = false;
-                      const objectNo = this.findObject(this.option.column, "objectNo");
-                      objectNo.disabled = false;
                     }
                   }else{
                     const toolsCodeId = this.findObject(this.option.column, "toolsCodeId");
@@ -112,8 +110,6 @@ export default {
                     kksNo.disabled = false;
                     if(["view"].includes(this.$route.query.frameMode)) {
                       kksNo.disabled = false;
-                      const objectNo = this.findObject(this.option.column, "objectNo");
-                      objectNo.disabled = false;
                     }
                   }
                 }
@@ -258,7 +254,6 @@ export default {
     }else{
       const objectNo = this.findObject(this.option.column, "objectNo");
       objectNo.value = ' ';
-      objectNo.disabled = true;
       const iStatus = this.findObject(this.option.column, "istatus");
       iStatus.display = false;
       const cancelReason = this.findObject(this.option.column, "cancelReason");

src/views/leger/equipmentledger.vue

@@ -635,7 +635,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          expUtil.excelExportEasy(`/api/workorder/export?daf-auth=${getToken()}`, this.search);
+          expUtil.excelExportEasy(`/api/equipmentledger/export?daf-auth=${getToken()}`, this.search);
         });
       },
       beforeOpen(done, type) {

src/views/leger/equipmentledgerDetail.vue

@@ -614,6 +614,8 @@
             {
               label: "页数",
               prop: "page",
+              type: 'number',
+              step: 1,
               span: 20,
               rules: [{
                 required: true,

src/views/leger/toolinventoryrecord.vue

@@ -62,11 +62,13 @@
   import {mapGetters} from "vuex";
   import {getToken} from "@/util/auth";
   import {Alert} from "element-ui";
+  import expUtil from "@/util/exportUtil";
   export default {
     data() {
       return {
         form: {},
         query: {},
+        search:{},
         loading: true,
         page: {
           pageSize: 10,
@@ -327,8 +329,7 @@
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          var formStr = Object.keys(this.search).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(this.search[key])}`).join('&');
+          expUtil.excelExportEasy(`/api/leger/toolinventoryrecord/export?daf-auth=${getToken()}`, this.search);
-          window.open(`/api/leger/toolinventoryrecord/export?daf-auth=${getToken()}&${formStr}`);
         });
       },
       beforeOpen(done, type) {

src/views/leger/toolinventoryrecordDetail.vue

@@ -552,6 +552,8 @@ export default {
             label: "页数",
             prop: "page",
             span: 20,
+            type: 'number',
+            step: 1,
             rules: [{
               required: true,
               message: "请输入页数",

src/views/smart/operationticketDetail.vue

@@ -43,7 +43,7 @@
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="$refs.crud2.rowAdd()">新增</el-button>
+                   @click="addrow">新增</el-button>
             </template>
           </avue-crud>
 
@@ -144,6 +144,7 @@ export default {
       //   value: undefined,
       //   label: ' '
       // }],
+
       form:'',
       closeTicketBox: false,
       defaultOperationTicketNo: "",
@@ -813,6 +814,11 @@ export default {
           this.$refs.crud.toggleSelection()
         });
     },
+
+    addrow(){
+      this.item_form.operationTicketNo = this.tab1_form.operationTicketNo;
+      this.$refs.crud2.rowAdd()
+    },
     // 操作项目 删除按钮处理
     item_rowDel (form, index,done) {
       this.$confirm("确定将选择数据删除?", {

src/views/smart/workpermitDetail.vue

@@ -34,6 +34,12 @@
                      @row-del="attachment_rowDel"
                      @row-update="attachment_rowUpdate"
                      @row-save="attachment_rowSave">
+                      <template slot="menuRight">
+                      <el-button type="primary"
+                                 size="small"
+                                 plain
+                                 @click="addrow()">新增</el-button>
+                              </template>
           </avue-crud>
         </div>
       </span>
@@ -505,7 +511,7 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn:  true,
+          addBtn:  false,
           viewBtn: false,
           delBtn: true,
           editBtn: true
@@ -634,6 +640,10 @@
         this.readonlyForm=false;
         this.frame_class = null;
       },
+      addrow(){
+        this.attachment_form.ticketCode = this.tab1_form.workTicketNo;
+        this.$refs.crud.rowAdd()
+      },
       updateToSearch () {
         this.readonlyForm=true;
         this.shouldShowButton=true;