1

src/views/activiti/form/demoForm2.vue

@@ -1277,11 +1277,11 @@ export default {
                             addForm = 'yes'
                         }else if(!factory || factory==''){
                             sonTable.every(item=>{
-                                if(item.accident_type=='扣款'){
-                                    this.$message.error('请上传工厂签章')
-                                    addForm = 'yes'
-                                    return false
-                                }
+                                // if(item.accident_type=='扣款'){
+                                //     this.$message.error('请上传工厂签章')
+                                //     addForm = 'yes'
+                                //     return false
+                                // }
                                 return true
                             })
                             

src/views/oa/modules/IncidentTicketModal.vue

@@ -204,6 +204,10 @@
             :triggerChange="true"
             dictCode="money-type"
           />
+          </span>
+           <!-- 扣款金额 -->
+           <span slot="referMoney" slot-scope="text, record, index">
+                  <a-input placeholder="请输入" v-model="record.referMoney" disabled="true"/>
           </span>
            <!-- U8生成运费发票号 -->
            <span slot="u8Invoice" slot-scope="text, record, index">
@@ -433,6 +437,14 @@
             scopedSlots: { customRender: 'practicalSum' },
             slots:{title:'practicalSumTitle'},
 
+          },
+          {
+            title: '扣款金额',
+            align: "center",
+            dataIndex: 'referMoney',
+            width: 131,
+            scopedSlots: { customRender: 'referMoney' },
+
           },
           {
             title: 'U8生成运费发票号',

src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -197,6 +197,10 @@
            <!-- 实际事故金额 -->
            <span slot="practicalSum" slot-scope="text, record, index">
                   <a-input placeholder="请输入" v-model="record.practicalSum" />
+          </span>
+           <!-- 扣款金额 -->
+           <span slot="referMoney" slot-scope="text, record, index">
+                  <a-input placeholder="请输入" v-model="record.referMoney" />
           </span>
            <!-- U8生成运费发票号 -->
            <span slot="u8Invoice" slot-scope="text, record, index">
@@ -361,10 +365,13 @@
                             <tr style="height: 50px;">
                                 <td class="tdOne" rowspan="3">情况说明</td>
                                 <td class="tdOne" colspan="5" rowspan="3" style="text-align: left;padding-left: 1%;">
-                                  <textarea style="width: 100%;border: none;overflow: hidden;" readOnly>{{ formState.presentationCondition }}</textarea>
-                                  <!-- {{ formState.presentationCondition }} -->
+                                    <textarea style="width: 100%;border: none;; resize:none; overflow: hidden;" readOnly>{{ formState.presentationCondition }}</textarea>
+                                    <div style="text-align: right; margin-top: -15%;margin-right: 50px;" v-if="factorySignatureUrl.includes('myfitt')">
+                                        <img ghost style="width:160px; height:160px;" :src="factorySignatureUrl"/>
+                                    </div>
                                 </td>
                             </tr>
+
                         </tbody>
                     </table>
                     <table class="table table-bordered" style="margin-top: 2%;border:2px solid #999">    
@@ -470,6 +477,7 @@
         accessory2:[],
         accessory:[],
         factorySignature:[],
+        factorySignatureUrl:'',
         updateDateString:'',
         columns: [
           { title: '姓名', align: 'center', width: '20%', widthRight: '70%', dataIndex: 'realname' },
@@ -625,7 +633,15 @@
             align: "center",
             dataIndex: 'practicalSum',
 
-            width: '7%',
+            width: '8%',
+            // scopedSlots: { customRender: 'practicalSum' },
+          },
+          {
+            title: '扣款金额',
+            align: "center",
+            dataIndex: 'referMoney',
+
+            width: '6%',
             // scopedSlots: { customRender: 'practicalSum' },
           },
           {
@@ -761,6 +777,9 @@
             // this.formState.invoicingDate = (this.formState.invoicingDate!==''&& this.formState.invoicingDate) ?moment(this.formState.invoicingDate):''
              this.formState.invoicingDate = moment(this.formState.invoicingDate)
              this.formState.accidentData =  moment( this.formState.accidentData).format('YYYY-MM-DD');
+             
+            
+             
              this.accessory2 = this.formState.accessory2?JSON.parse(this.formState.accessory2):[]
              var accessory2Z =[]
              this.accessory2.map(item=>{
@@ -782,10 +801,10 @@
              var factorySignatureZ=[]
              this.factorySignature.map(item =>{
               factorySignatureZ.push(item.url)
+               this.factorySignatureUrl = item.url;
              })
              this.factorySignature =factorySignatureZ
 
-             //
              zhuId = res.result.id
              this.getTable(zhuId)
              this.getNotifier(zhuId)