Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt into test

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

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -4,7 +4,7 @@
 
     <div class="iframe_box"  ref="iframeBox">
       <!--   src="http://aiot.zoomwin.com.cn:51001/page-main-data/product/oneProduct?isWt=true&businessId=1895440590572208130" -->
-
+      <!-- {{ location + '/page-main-data/product/oneProduct?isWt=true&businessId=' + businessId }} -->
      <iframe
      :src="location + '/page-main-data/product/oneProduct?isWt=true&businessId=' + businessId" 
       width="100%"

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

@@ -1,13 +1,14 @@
 <template>
   <!--流程标识： bom_approver  -->
   <el-col :span="16" :offset="6">
-    <el-form label-width="100px" ref="formRef" :model="form">
-
-      <el-form-item label="审批建议" prop="reason" style="margin-bottom: 20px" :rules="{
+    <!-- :rules="{
         required: true,
         message: '请选择',
         trigger: 'change'
-      }">
+      }" -->
+    <el-form label-width="100px" ref="formRef" :model="form">
+
+      <el-form-item label="审批建议"  style="margin-bottom: 20px">
         <el-input type="textarea" v-model="form.reason" placeholder="请输入审批建议" />
       </el-form-item>
     </el-form>

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

@@ -4,7 +4,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -4,7 +4,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+     
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -28,7 +28,7 @@
       </el-form-item>
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+ 
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+ 
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+    
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -11,7 +11,7 @@
 
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -88,7 +88,7 @@
         </el-form-item>
         <el-form-item
           label="审批建议"
-          prop="reason"
+
           style="margin-bottom: 20px"
           :rules="{
             required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+    
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/exceptionManagement/exceptionList/submit.vue

@@ -34,7 +34,7 @@
 
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/financialManage/feeManage/feeApplication/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+   
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/financialManage/invoiceManage/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/financialManage/receivableManage/submit.vue

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+   
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -28,7 +28,7 @@
       </el-form-item>
       <el-form-item
         label="审批建议"
-        prop="reason"
+   
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/measuringToolInspection/submit copy.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+  
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -1,7 +1,7 @@
 <template>
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
-      <el-form-item label="审批建议" prop="reason" style="margin-bottom: 20px">
+      <el-form-item label="审批建议"  style="margin-bottom: 20px">
         <el-input
           type="textarea"
           v-model="form.reason"

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -28,7 +28,7 @@
       </el-form-item>
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/project-manage/plan-manage/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+  
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/project-manage/project-initiation/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/project-manage/task-manage/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/project-manage/team-manage/submit.vue

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/purchaseOrder/accountstatement/submit.vue

@@ -1,9 +1,8 @@
 <template>
   <el-col :span="16" :offset="6">
-    <el-form label-width="100px" ref="formRef" :model="form">
+    <el-form label-width="100px"  :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/purchaseOrder/invoice/submit.vue

@@ -26,7 +26,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="审批建议" prop="reason" style="margin-bottom: 20px">
+      <el-form-item label="审批建议"  style="margin-bottom: 20px">
         <el-input
           type="textarea"
           v-model="form.reason"

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/purchaseOrder/outSourceSendCk/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+ 
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/purchaseOrder/returnGoods/submit.vue

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -28,7 +28,6 @@
       </el-form-item>
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -28,7 +28,7 @@
       </el-form-item> -->
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/saleOrder/accountstatement/submit.vue

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/submit.vue

@@ -36,7 +36,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="审批建议" prop="reason" style="margin-bottom: 20px">
+      <el-form-item label="审批建议"  style="margin-bottom: 20px">
         <el-input
           type="textarea"
           v-model="form.reason"

src/views/bpm/handleTask/components/saleOrder/entrustedReceive/submit.vue

@@ -28,7 +28,7 @@
       </el-form-item>
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/saleOrder/entrustedReceiveReturnGoods/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/saleOrder/exceptionManagement/submit.vue

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/saleOrder/invoice/submit.vue

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/saleOrder/invoiceConfirm/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/saleOrder/returnGoods/submit.vue

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/submit.vue

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
+
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

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

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/components/transportManager/shipManage/submit.vue

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-        prop="reason"
         style="margin-bottom: 20px"
         :rules="{
           required: true,

src/views/bpm/handleTask/formParser/formParserDialog.vue

@@ -18,9 +18,10 @@
     </fm-generate-form>
     <div slot="footer" class="dialog-footer">
       <el-form label-width="100px" ref="formRef" :model="form">
+        <!-- prop="reason" -->
         <el-form-item
           label="审批建议"
-          prop="reason"
+        
           style="margin-bottom: 20px"
           :rules="{
           required: true,

src/views/bpm/handleTask/index.vue

@@ -47,7 +47,7 @@
           :key="index"
         >
           <div slot="header" class="clearfix">
-            <span class="el-icon-picture-outline">审批任务</span>
+            <span class="el-icon-picture-outline">审批任务11111</span>
           </div>
           <div v-if="processInstance.processDefinition">
             <async-sub-form-component
@@ -62,7 +62,10 @@
               @submit="submit"
               @handleClose="handleClose"
               ref="subForm"
-            ></async-sub-form-component>
+
+            ></async-sub-form-component> 
+
+
           </div>
           <!-- <div> </div> -->
           <!-- <el-col :span="16" :offset="6">
@@ -472,9 +475,12 @@
 
 
           Vue.component('async-biz-form-component', (resolve) => {
+            console.log(this.listData.pcViewRouter,'111111');
             require([`@/views${this.listData.pcViewRouter}`], resolve);
           });
           Vue.component('async-sub-form-component', (resolve) => {
+            console.log(this.listData.pcHandleRouter,'22222');
+
             require([`@/views${this.listData.pcHandleRouter}`], resolve);
           });
           //   // 设置表单信息