修改放行单的bug

src/views/bpm/handleTask/components/mesWorkOrderChecklist/detailDialog.vue

@@ -48,6 +48,51 @@
         </template>
       </ele-pro-table>
 
+      <table
+        class="detail-table"
+        key="first-table"
+        style="width: 500px; margin: 15px 0"
+      >
+        <tr>
+          <td>结论</td>
+          <td>
+            <el-radio-group
+              v-model="form.workConclution"
+              :disabled="isScDisabled"
+            >
+              <el-radio :label="0">不符合规定</el-radio>
+              <el-radio :label="1">符合规定</el-radio>
+            </el-radio-group>
+          </td>
+        </tr>
+        <tr>
+          <td>验收人</td>
+          <td>
+            <div class="mask-box">
+              <el-input
+                v-model="form.workCheckUserName"
+                placeholder="请输选择验收人"
+                readonly
+                :disabled="isScDisabled"
+              ></el-input>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td>验收时间</td>
+          <td>
+            <el-date-picker
+              v-model="form.workCheckTime"
+              type="datetime"
+              placeholder="选择日期时间"
+              style="width: 100%"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :disabled="isScDisabled"
+            ></el-date-picker>
+          </td>
+        </tr>
+      </table>
+
       <header-title title="质检放行规则" />
       <ele-pro-table
         row-key="id"
@@ -71,6 +116,51 @@
           />
         </template>
       </ele-pro-table>
+
+      <table
+        class="detail-table"
+        key="tow"
+        style="width: 500px; margin: 15px 0"
+      >
+        <tr>
+          <td>结论</td>
+          <td>
+            <el-radio-group
+              v-model="form.qualityConclution"
+              :disabled="isZjDisabled"
+            >
+              <el-radio :label="0">不符合规定</el-radio>
+              <el-radio :label="1">符合规定</el-radio>
+            </el-radio-group>
+          </td>
+        </tr>
+        <tr>
+          <td>验收人</td>
+          <td>
+            <div class="mask-box" @click="openSelectUser(1)">
+              <el-input
+                v-model="form.qualityCheckUserName"
+                placeholder="请输选择验收人"
+                readonly
+                :disabled="isZjDisabled"
+              ></el-input>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td>验收时间</td>
+          <td>
+            <el-date-picker
+              v-model="form.qualityCheckTime"
+              type="datetime"
+              placeholder="选择日期时间"
+              style="width: 100%"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :disabled="isZjDisabled"
+            ></el-date-picker>
+          </td>
+        </tr>
+      </table>
     </el-form>
   </div>
 </template>
@@ -99,11 +189,21 @@
         approvalStatus: null,
         checklistType: 0,
         code: '',
+        createUserName: '',
+        details: [],
         name: '',
         orders: [],
-        details: [],
-        workConclution: null,
-        qualityConclution: null
+        processInstanceId: '',
+        qualityCheckTime: '',
+        qualityCheckUserId: null,
+        qualityCheckUserName: '',
+        qualityConclution: null,
+        templateId: 0,
+        templateName: '',
+        workCheckTime: '',
+        workCheckUserId: null,
+        workCheckUserName: '',
+        workConclution: null
       };
 
       return {

src/views/bpm/handleTask/components/mesWorkOrderChecklist/submit.vue

@@ -113,7 +113,10 @@
         let variables = {
           pass: !!status,
           approvalResultMsg: this.form.reason,
-          details: changeList
+          details: changeList,
+          productConclution: formData.workConclution,
+          qualityConclution: formData.qualityConclution,
+          approvalResult: this.form.reason
         };
 
         let API = !!status ? approveTaskWithVariables : rejectTask;