0412 新看板

src/views/modules/production/inspect.vue

@@ -94,7 +94,7 @@
         <template slot-scope="scope" class="foo_container">
           <a v-if="scope.row.inspectedFlag=='N'" type="text" size="small" @click="inspectModal(scope.row)">检验</a>
           <a v-if="scope.row.inspectedFlag=='Y'" type="text" size="small" @click="toPrint(scope.row)">补打结果</a>
-          <a v-if="scope.row.inspectedFlag=='Y'" type="text" size="small" @click="cancelInspectResult(scope.row)">取消检验结果</a>
+          <a v-if="scope.row.inspectedFlag=='Y'&&scope.row.toTypeFlagDb!='S'" type="text" size="small" @click="cancelInspectResult(scope.row)">取消检验结果</a>
           <a v-if="scope.row.toTypeFlag=='混炼胶入库'" type="text" size="small" @click="detailModal(scope.row)">混炼明细</a>
           <a v-if="scope.row.toTypeFlagDb=='I'&&scope.row.inspectedFlag=='N'" type="text" size="small" @click="cancelInspect(scope.row)">删除检验单</a>
         </template>
@@ -242,6 +242,18 @@
           <el-input  type="textarea" style="width: 282px" v-model="inspectData.inspectRemark"></el-input>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'新失效日期：'" v-if="inspectData.toTypeFlagDb=='S'">
+          <el-date-picker
+            style="width: 120px"
+            v-model="inspectData.newDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            format = "yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
       <el-footer style="height:40px;margin-top: 30px;text-align:center">
         <el-button type="primary" @click="inspectSave()">保存</el-button>
         <el-button type="primary" @click="inspectFlag = false">关闭</el-button>
@@ -383,6 +395,8 @@
           inspectRemark:'',
           operatorName:'',
           seqNo:'',
+          newDate:'',
+          confirmedTransNo:'',
         },
         inspectFlag:false,
       }
@@ -459,6 +473,8 @@
         this.inspectData.inspectResult= JSON.parse(JSON.stringify(row.inspectResult));
         this.inspectData.inspectRemark= JSON.parse(JSON.stringify(row.inspectRemark));
         this.inspectData.seqNo=row.seqNo;
+        this.inspectData.newDate='',
+          this.inspectData.confirmedTransNo=row.confirmedTransNo
         this.inspectFlag=true;
       },
       inspectSave(){
@@ -468,7 +484,12 @@
           })
           return false
         }
-
+        if(this.inspectData.toTypeFlagDb=='S'&&(this.inspectData.newDate==''||this.inspectData.newDate==null)){
+          this.$alert('请选择新的失效日期！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
         inspectSave(this.inspectData).then(({data}) => {
           if (data && data.code === 0) {
             this.search ();