695593266@qq.com 11 месяцев назад
Родитель
Сommit
e232a0dd7d

+ 2 - 0
src/views/inspectionPlan/components/new-edit.vue

@@ -1378,6 +1378,8 @@
         this.baseForm.sampleNumber = list.length;
         this.baseForm.sampleNumber = list.length;
         this.samplePagination.currentPage = 1;
         this.samplePagination.currentPage = 1;
         this.samplePagination.total = list.length;
         this.samplePagination.total = list.length;
+
+        // const sampleProportion = this
         // this.samplePagination.total = this.sampleList.length;
         // this.samplePagination.total = this.sampleList.length;
       },
       },
 
 

+ 6 - 4
src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -185,21 +185,21 @@
                 </template>
                 </template>
                 <template v-else-if="column.prop === 'materielDesignation'">
                 <template v-else-if="column.prop === 'materielDesignation'">
                   <el-input
                   <el-input
-                    :disabled="scope.row.isMaterielDesignationEmpty"
+                    :disabled="status == 1"
                     v-model="scope.row.materielDesignation"
                     v-model="scope.row.materielDesignation"
                     size="mini"
                     size="mini"
                   ></el-input>
                   ></el-input>
                 </template>
                 </template>
                 <template v-else-if="column.prop === 'clientCode'">
                 <template v-else-if="column.prop === 'clientCode'">
                   <el-input
                   <el-input
-                    :disabled="scope.row.isClientCodeEmpty"
+                    :disabled="status == 1"
                     v-model="scope.row.clientCode"
                     v-model="scope.row.clientCode"
                     size="mini"
                     size="mini"
                   ></el-input>
                   ></el-input>
                 </template>
                 </template>
                 <template v-else-if="column.prop === 'engrave'">
                 <template v-else-if="column.prop === 'engrave'">
                   <el-input
                   <el-input
-                    :disabled="scope.row.isEngraveEmpty"
+                    :disabled="status == 1"
                     v-model="scope.row.engrave"
                     v-model="scope.row.engrave"
                     size="mini"
                     size="mini"
                   ></el-input>
                   ></el-input>
@@ -208,6 +208,7 @@
                   <el-input
                   <el-input
                     type="number"
                     type="number"
                     v-model="scope.row.weight"
                     v-model="scope.row.weight"
+                    :disabled="scope.row.status == 1"
                     :min="0"
                     :min="0"
                     @input="inputWeight(scope.row, scope.$index)"
                     @input="inputWeight(scope.row, scope.$index)"
                     size="mini"
                     size="mini"
@@ -421,7 +422,8 @@
       loading: Boolean,
       loading: Boolean,
       form: Object,
       form: Object,
       ids: String,
       ids: String,
-      activeName: String
+      activeName: String,
+      status: Number
     },
     },
     data() {
     data() {
       return {
       return {

+ 4 - 1
src/views/inspectionWork/edit.vue

@@ -38,6 +38,7 @@
         :scheme-list="schemeList"
         :scheme-list="schemeList"
         :loading="loading"
         :loading="loading"
         :form="form"
         :form="form"
+        :status="statusType"
         @handleSelectionChange="handleSelectionChange1"
         @handleSelectionChange="handleSelectionChange1"
         @batch-quality="batchQuality"
         @batch-quality="batchQuality"
         @batch-dispose="batchDispose"
         @batch-dispose="batchDispose"
@@ -158,7 +159,8 @@
         SampleListbyReportList: [],
         SampleListbyReportList: [],
         qualityTimeStart: '',
         qualityTimeStart: '',
         isReportProcessProduce: false,
         isReportProcessProduce: false,
-        addStatus: []
+        addStatus: [],
+        statusType: ''
       };
       };
     },
     },
     watch: {
     watch: {
@@ -433,6 +435,7 @@
       async getDetail() {
       async getDetail() {
         getById(this.$route.query.id).then((res) => {
         getById(this.$route.query.id).then((res) => {
           this.form = res.data;
           this.form = res.data;
+          this.statusType = this.form.status;
 
 
           this.isReportProcessProduce =
           this.isReportProcessProduce =
             this.form.isReportProcessProduce == 1 ? true : false;
             this.form.isReportProcessProduce == 1 ? true : false;