Merge remote-tracking branch 'origin/main'

src/views/smart/workorder.vue

@@ -33,7 +33,7 @@
         <el-button @click="rowDel(row)" type="text" size="small" icon="el-icon-delete">删除</el-button>
       </template>
     </avue-crud>
-    <el-dialog title="上传处理结果" width="30%" :visible.sync="dialogFormVisible" :before-close="closeDialog">
+    <el-dialog title="上传处理结果" width="35%" :visible.sync="dialogFormVisible" :before-close="closeDialog">
       <el-form :model="dialogForm" ref="dialogForm">
         <el-form-item label="处理时间" :label-width="formLabelWidth">
           <el-col :span="24">

src/views/smart/workorderDetail.vue

@@ -102,7 +102,7 @@
               },
               event: {
                 change: (val) => {
-                  if (this.$route.query.frameMode == "add") {
+                  if (this.addupdateShowButton) {
                     this.tab1_form.kksDescriptdion = '';
                     this.tab1_form.station = '';
                     if (val) {
@@ -129,7 +129,7 @@
               // offset:6,
               span: 8,
               maxlength: 400,
-              disabled: this.$route.query.frameMode != 'search'
+              disabled: true
             }, {
               label: "场站",
               prop: "station",
@@ -145,7 +145,7 @@
                 message: "请选择场站",
                 trigger: "blur"
               }],
-              disabled: this.$route.query.frameMode != 'search'
+              disabled: true
             }, {
               label: "工单编号",
               prop: "workOrderNo",
@@ -310,6 +310,8 @@
     created() {
       this.type = this.option.column[0];
       if (this.$route.query.frameMode == "add") {
+        this.tab1_option.column[1].disabled = true;
+        this.tab1_option.column[2].disabled = true;
         this.readonlyForm = false;
         this.shouldShowButton = false;
         this.addupdateShowButton = true;
@@ -317,6 +319,8 @@
         this.checkStatusValue = this.$route.query.checkstatus;
         this.searchDetail();
       } else if (this.$route.query.frameMode == "search") {
+        this.tab1_option.column[1].disabled = false;
+        this.tab1_option.column[2].disabled = false;
         this.readonlyForm = true;
         this.shouldShowButton = true;
         this.addupdateShowButton = false;
@@ -348,6 +352,8 @@
         }
       },
       updateToSearch() {
+        this.tab1_option.column[1].disabled = false;
+        this.tab1_option.column[2].disabled = false;
         this.readonlyForm = true;
         this.shouldShowButton = true;
         this.addupdateShowButton = false;
@@ -432,8 +438,7 @@
         });
       },
       submitRejectOrauditing(status) {
-        var formData = {...this.tab1_form};
-        formData.approvalStatus = status;
+        var formData = {id: this.tab1_form.id, approvalStatus: status};
         update(formData).then(() => {
           this.$router.push({
             path: "/smart/workorder",
@@ -452,6 +457,8 @@
         });
       },
       seachToUpdate() {
+        this.tab1_option.column[1].disabled = true;
+        this.tab1_option.column[2].disabled = true;
         this.shouldShowButton = false;
         this.addupdateShowButton = true;
         this.readonlyForm = false;