2，4优化

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmBgJiaofu.vue

@@ -6,11 +6,12 @@
         <td class="title" style="width: 100px">试验完成时间</td>
         <td class="content" style="width: 360px">
           <!-- <div style="width: 440px"></div> -->
-          <input v-model="tableData.wanChengTime" style="text-align: center" />
+          <j-date v-model="tableData1.wanChengTime" placeholder="请选择日期" :disabled='disabled1'></j-date>
+          <!-- <input v-model="tableData1.wanChengTime" style="text-align: center" /> -->
         </td>
         <td class="title white" style="width: 100px">添加归档材料</td>
         <td class="content" style="width: 450px">
-          <j-upload v-model="fileList" text="上传"></j-upload>
+          <j-upload v-model="tableData1.fileList" text="上传" :disabled='disabled1'></j-upload>
           <!-- <input id="excel" type="file" name="excel"
             @change="getFilePath"
           /> -->
@@ -23,34 +24,35 @@
       <tr>
         <td class="title" style="width: 100px">添加试验报告</td>
         <td class="content" style="width: 360px">
-          <j-upload v-model="fileListBg" text="上传"></j-upload>
+          <j-upload v-model="tableData1.fileListBg" text="上传" :disabled='disabled1'></j-upload>
           <!-- <div style="width: 440px"></div> -->
         </td>
         <td class="title white" style="width: 100px">质量审核</td>
-        <td class="content" style="width: 450px">
-          <div class="btn" style="margin-right:1.1%" @click="addSubTable">提交</div>
-          <!-- <input v-model="tableData.shuruLeixing" style="text-align: center" /> -->
+        <td class="content" style="width: 450px;display:flex;border:0px;align-items:center;justify-content: center;">
+          <div style="text-align: center;line-height: 50px;">{{ fqUser1 }}　　时间： {{ shenheTime1 }}</div>
+          <div class="btn" style="margin-right:1.1%" @click="addSubTable1">保存</div>
         </td>
       </tr>
       <tr>
         <td class="title" style="width: 100px">客户反馈</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <!-- <div style="width: 440px"></div> -->
+          <input v-model="tableData2.khFanKui" style="text-align: center" :disabled='disabled2'/>
         </td>
         <td class="title white" style="width: 100px">报告签发</td>
         <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+          <input v-model="tableData2.bgQianFa" style="text-align: center" :disabled='disabled2'/>
         </td>
       </tr>
       <tr>
         <td class="title" style="width: 100px">报告办理</td>
         <td class="content" style="width: 360px">
-          <j-upload v-model="fileListBl" text="上传"></j-upload>
+          <j-upload v-model="tableData2.fileListBl" text="上传" :disabled='disabled2'></j-upload>
           <!-- <div style="width: 440px"></div> -->
         </td>
         <td class="title white" style="width: 100px">报告接收</td>
         <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+          <input v-model="tableData2.bgJieShou" style="text-align: center" :disabled='disabled2'/>
         </td>
       </tr>
       <tr>
@@ -60,9 +62,10 @@
         </td>
         <!-- <td class="content" style="width: 100px" colspan="2"></td> -->
         <td class="title white" style="width: 100px">报告归档</td>
-        <td class="content" style="width: 450px">
-          <div class="btn" style="margin-right:1.1%" @click="addSubTable">提交</div>
-          <!-- <input v-model="tableData.shuruLeixing" style="text-align: center" /> -->
+        <td class="content" style="width: 450px;display:flex;border:0px;align-items:center;justify-content: center;">
+          <div style="text-align: center;line-height: 50px;">{{ fqUser2 }}　　时间： {{ shenheTime2 }}</div>
+          <div class="btn" style="margin-right:1.1%" @click="addSubTable2">保存</div>
+          <!-- <input v-model="tableData2.shuruLeixing" style="text-align: center" /> -->
         </td>
       </tr>
     </table>
@@ -71,6 +74,7 @@
 
 <script>
 import JUpload from '@/components/jeecg/JUpload'
+import { runFlowPathSaveData } from '@/api/api'
 export default {
     name: 'itdmBgJiaofu',
     components: { JUpload },
@@ -84,39 +88,101 @@ export default {
     },
     data() {
         return {
-            tableData: {
-              cleanPrice: [
-                {
-                  total: 0,
-                },
-              ],
+            tableData1: {
               // 完成时间
               wanChengTime: '',
+              // 添加归档材料
+              fileList:[],
+              // 添加试验报告
+              fileListBg:[],
+            },
+            tableData2: {
+              // 报告办理
+              fileListBl:[],
             },
-            // 添加归档材料
-            fileList:[],
-            // 添加试验报告
-            fileListBg:[],
-            // 报告办理
-            fileListBl:[],
-            // 导入excel
-            excel: '',
+            // // 导入excel
+            // excel: '',
+            disabled1: true,
+            disabled2: true,
+            fqUser1: '',
+            shenheTime1: '',
+            fqUser2: '',
+            shenheTime2: ''
         }
     },
     created(){
       console.log(44444,this.tableData4)
     },
+    watch: {
+      tableData4: {
+        handler(newV, oldV){
+          if(newV){
+            if (newV[0].saveData != null) {
+              this.tableData1 = JSON.parse(newV[0].saveData)
+              this.fqUser1 = newV[0].fqUser
+              this.shenheTime1 = newV[0].shenheTime
+            }
+            if (newV[1].saveData != null) {
+              this.tableData2 = JSON.parse(newV[1].saveData)
+              this.fqUser2 = newV[1].fqUser
+              this.shenheTime2 = newV[1].shenheTime
+            }
+            if (newV[0].dangqian == true && newV[0].isUpdate == true) {
+              this.disabled1 = false
+            }
+            if (newV[1].dangqian == true && newV[1].isUpdate == true) {
+              this.disabled2 = false
+            }
+          }
+        },
+        deep: true,
+        immediate: true
+      }
+    },
     methods: {
       // 点击导入excel
-      daoruButton() {
-        document.getElementById('excel').click()
-      },
-      getFilePath(e) {
-        this.excel = document.getElementById('excel').files[0].name
-        console.log(this.excel)
+      // daoruButton() {
+      //   document.getElementById('excel').click()
+      // },
+      // getFilePath(e) {
+      //   this.excel = document.getElementById('excel').files[0].name
+      //   console.log(this.excel)
+      // },
+      addSubTable1() {
+        if (this.tableData4[0].dangqian == true && this.tableData4[0].isUpdate == true) {
+          console.log(this.tableData1,this.tableData4[0].id)
+          const a = {
+            runFlowPathStep: this.tableData4[0].id,
+            saveData: JSON.stringify(this.tableData1)
+          }
+          console.log(a)
+          runFlowPathSaveData(a).then((res) => {
+            console.log(res)
+            if (res.success) {
+              this.$message.success(res.message)
+            }
+          })
+        } else {
+          this.$message.error("无保存权限或当前节点不在进行中")
+        }
       },
-      addSubTable() {
-        console.log(this.fileList)
+      addSubTable2() {
+        if (this.tableData4[1].dangqian == true && this.tableData4[1].isUpdate == true) {
+          console.log(this.tableData2,this.tableData4[1].id)
+          const a = {
+            runFlowPathStep: this.tableData4[1].id,
+            saveData: JSON.stringify(this.tableData2)
+          }
+          console.log(a)
+          runFlowPathSaveData(a).then((res) => {
+            console.log(res)
+            if (res.success) {
+              this.$message.success(res.message)
+            }
+          })
+        } else {
+          this.$message.error("无保存权限或当前节点不在进行中")
+        }
       }
     }
 }
@@ -158,7 +224,7 @@ tr {
   cursor: pointer;
 }
 .btn {
-  display: inline-block;
+  /* display: inline-block; */
   padding: 2px 10px;
   font-size: 13px;
   border: 1px solid rgb(3, 188, 244);

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmXqPingshen.vue

@@ -132,9 +132,9 @@
       <tr>
         <td class="title" style="width: 100px;" colspan="2">项目流转</td>
         <td class="title white" style="width: 100px;">工程技术部部长</td>
-        <td class="content" style="width: 450px;display:flex;border:0px;" >
+        <td class="content" style="width: 450px;display:flex;border:0px;align-items:center;" >
           <div style="height:50px;width: 450px;text-align: center;line-height: 50px;">{{ fqUser }}　　时间： {{ shenheTime }}</div>
-          <div class="btn" style="position: absolute;right: 3%; margin-top:1%;" @click="addSubTable2">保存</div>
+          <div class="btn" style="position: absolute;right: 3%;" @click="addSubTable2">保存</div>
           <!-- <input v-model="tableData.shuruLeixing" style="text-align: center" /> -->
         </td>
       </tr>