0412 新看板

src/views/modules/Abnormal/AbnormalFeedBack.vue

@@ -182,7 +182,7 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" v-if="searchData.userId==='admin'||searchData.userId==='E0002'" @click="updateModel(scope.row)">修改</a>
-          <a type="text" size="small" @click="getFileModel(scope.row)">附件</a>
+          <a type="text" size="small" @click="getFileModel(scope.row)">整改文件</a>
           <a type="text" size="small" @click="getDetailModel(scope.row)">查看</a>
           <a type="text" size="small" @click="doPrint(scope.row)">打印</a>
           <a type="text" size="small" v-if="scope.row.status!='已完结'" @click="getDetailModel2(scope.row)">紧急处理方式</a>
@@ -426,7 +426,7 @@
         <el-button type="primary" @click="modalFlag = false">取消</el-button>
       </el-footer>
     </el-dialog>
-    <el-dialog title="附件" :close-on-click-modal="false" v-drag :visible.sync="fileModalFlag" width="650px" >
+    <el-dialog title="整改文件" :close-on-click-modal="false" v-drag :visible.sync="fileModalFlag" width="650px" >
       <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
         <el-form :inline="true" label-position="top" style="margin-top: 0px">
           <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
@@ -468,7 +468,7 @@
         </el-table-column>
       </el-table>
     </el-dialog>
-    <el-dialog title="上传附件" :close-on-click-modal="false" v-drag :visible.sync="upLoadModalFlag" width="400px" >
+    <el-dialog title="上传整改文件" :close-on-click-modal="false" v-drag :visible.sync="upLoadModalFlag" width="400px" >
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
         <el-upload drag :file-list="fileList"
                    action="javascript:void(0);" ref="uploadFile"
@@ -1082,7 +1082,7 @@
       },
       upLoadFiles(){
         if(null == this.fileList || 0 === this.fileList.length){
-          this.$alert('未选择附件上传！', '错误', {
+          this.$alert('未选择整改文件上传！', '错误', {
             confirmButtonText: '确定'
           })
           return false;

src/views/modules/production/reworkRecord.vue

@@ -288,20 +288,26 @@ export default {
       })
     },
     cancelReportWork(row){
-      let params = {
-        reworkNo: row.reworkNo,
-      }
-      cancelRework(params).then(({data})=>{
-        if (data && data.code === 0){
-          this.$message.success(data.msg)
-          this.selectRework()
-        }else {
-          this.$message.warning(data.msg)
+      this.$confirm('是否取消该返工信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=>{
+        let params = {
+          reworkNo: row.reworkNo,
         }
-      }).catch((error)=>{
-        this.$message.error(error)
+        cancelRework(params).then(({data})=>{
+          if (data && data.code === 0){
+            this.$message.success(data.msg)
+            this.selectRework()
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
       })
-    }
+    },
   },
   watch:{
     'saveRework.operatorId'(newVal, oldVal){

src/views/modules/production/scheduleForSOTask.vue

@@ -147,29 +147,29 @@
         prop="site"
         header-align="center"
         align="left"
-        min-width="120"
-        label="工厂编号">
+        min-width="50"
+        label="工厂">
       </el-table-column>
       <el-table-column
         prop="orderNo"
         header-align="center"
         align="left"
-        min-width="120"
+        min-width="140"
         label="日计划号">
       </el-table-column>
       <el-table-column
         prop="finishFlag"
         header-align="center"
         align="left"
-        min-width="90"
-        label="是否打料完成">
+        min-width="70"
+        label="是否打料">
       </el-table-column>
       <el-table-column
         prop="vpFinishFlag"
         header-align="center"
         align="left"
-        min-width="90"
-        label="VP是否入库">
+        min-width="70"
+        label="VP入库">
       </el-table-column>
       <el-table-column
         prop="itemNo"
@@ -182,7 +182,7 @@
         prop="operationDesc"
         header-align="center"
         align="left"
-        min-width="160"
+        min-width="80"
         label="工序名称">
       </el-table-column>
       <el-table-column