Merge remote-tracking branch 'origin/main'

src/views/release/productioninformation.vue

@@ -252,6 +252,8 @@
 
     methods: {
       rowSave(row, done, loading) {
+        this.form.checkstatus="1";
+        this.form.id = row.id;
         add(row).then(() => {
           done();
           this.onLoad(this.page);
@@ -265,6 +267,7 @@
         });
       },
       rowUpdate(row, index, done, loading) {
+        row.checkstatus="1";
         update(row).then(() => {
           done();
           this.onLoad(this.page);

src/views/smart/operationticket.vue

@@ -625,7 +625,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
         debugger
          return closeticket( this.updateid, this.closeTicketForm.isQuakified,this.closeTicketForm.riskControlEvaluation)
           .then(() => {
-            this.closeTicketForm.isQuakifie = -1;
+            this.closeTicketForm.isQuakifie = '';
             this.closeTicketForm.riskControlEvaluation = '';
             this.closeTicketBox = false;
             this.onLoad(this.page);

src/views/smart/operationticketDetail.vue

@@ -5,7 +5,7 @@
        <span >
         <el-col >
           审核状态:
-          <el-select v-model="checkStatusValue">
+          <el-select v-model="checkStatusValue" >
             <el-option
               v-for="item in optionCheckStatus"
               :key="item.value"
@@ -105,16 +105,16 @@ export default {
     return {
       checkStatusValue: this.$route.query.reviewStatus,
       optionCheckStatus: [{
-        value: "1",
+        value: 1,
-        label: '审核中'
+        label: '审核中',
       }, {
-        value: "2",
+        value: 2,
-        label: '已审核'
+        label: '已审核',
       }, {
-        value: "3",
+        value: 3,
-        label: '未通过'
+        label: '未通过',
       }, {
-        value: "4",
+        value: 4,
         label: ' '
       }],
       defaultOperationTicketNo: "",
@@ -128,7 +128,12 @@ export default {
         column: [{
           label: '基本信息',
           prop: 'information',
-        }
+        },
+          {
+            label: '操作项目',
+            prop: 'operationItem',
+            disabled: true,
+          },
         ]
       },
 
@@ -147,7 +152,6 @@ export default {
                 dicUrl: "/api/equipmentledger/getKksList",
                 props: {
                   label: "kksEncoding",
-
                   value: "kksEncoding",
                 },
                 event: {
@@ -216,6 +220,11 @@ export default {
                 }],
                 span: 8,
                 maxlength: 20,
+                event: {
+                  change: (val) => {
+                    this.option.column[1].disabled = !val;
+                  },
+                }
               },
               {
                 label: "操作票类型",
@@ -440,10 +449,7 @@ export default {
                 span: 8,
                 maxlength: 20,
               },
-
-
             ]
-
           },
           ]
       },
@@ -541,11 +547,12 @@ export default {
   },
   created () {
     this.type = this.option.column[0];
-    this.option.column.push({ label: '操作项目', prop: 'operationItem' });
+    // this.option.column.push({ label: '操作项目', prop: 'operationItem' });
     if(this.$route.query.frameMode == "add"){
       this.readonlyForm=false;
       this.shouldShowButton=false;
       this.addUpdateShowButton=true;
+      this.addUpdateShowButton=true;
       this.frame_class = null;
     }else{
       this.readonlyForm=false;
@@ -602,6 +609,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
+          this.tab1_form.reviewStatus="1"
           add(this.tab1_form).then(() => {
             this.$router.push({
               path: "/smart/operationticket",
@@ -642,20 +650,13 @@ export default {
     },
     handleChange (column) {
       this.type = column
-      if(this.$route.query.frameMode != "add"){
-        if (column.prop == 'operationItem') {
-          this.item_onLoad();
-        }
-      }
-      if(column.prop == 'operationItem'){
-        if(this.tab1_form.operationTicketNo ==="" || this.tab1_form.operationTicketNo ===null){
-          this.$message({
-            type: "error",
-            message: "请返回基本信息填写“操作票编号”!!!"
-          });
-        }
-      }
       this.item_form.operationTicketNo = this.tab1_form.operationTicketNo;
+      this.item_onLoad();
+      if(this.type.prop==='operationItem'){
+        this.addUpdateShowButton=false;
+      }else {
+        this.addUpdateShowButton=true;
+      }
     },
 
     // 操作项目 新增按钮处理
@@ -776,9 +777,9 @@ export default {
     headerClass(){
       return 'head-style'
     },
-    item_onLoad(row, params = {}) {
+    item_onLoad() {
       this.loading = true;
-      item_getListByItemId(this.item_data[0].operationTicketNo).then(res => {
+      item_getListByItemId(this.tab1_form.operationTicketNo).then(res => {
         this.item_data = res.data.data;
         this.loading = false;
       });
@@ -803,13 +804,27 @@ export default {
 .frame_class1 .el-input__icon {
   display: none;
 }
-.frame_class1 .el-input--prefix .el-input__inner {
+.frame_class1 .el-input--prefix  {
   padding-left: 15px;
 }
 .container {
   display: flex;
   justify-content: flex-end; /* 将子元素推到容器的末端 */
 }
+.frame_class1 textarea.el-textarea__inner {
+  border: none;
+  box-shadow: none;
+  outline: none;
+  pointer-events: none;
+}
+.frame_class1 input::placeholder {
+  color: transparent;
+  display: none; /* 默认隐藏 */
+}
+.frame_class1 textarea::placeholder {
+  color: transparent;
+  display: none; /* 默认隐藏 */
+}
 .check_status_class {
   display: flex;
   justify-content: flex-end; /* 将子元素推到容器的末端 */