Browse Source

森语-事故处理单

jbb 2 years ago
parent
commit
2d01d64a40

+ 11 - 7
src/views/oa/IncidentTicketList.vue

@@ -206,6 +206,11 @@ import moment from 'moment'
             dataIndex: 'accidentNumber',
             width:130
           },
+          {
+            title:'财务备注',
+            align:"center",
+            dataIndex: 'financeRemark',
+          },
           {
             title:'质量事故单主题',
             align:"center",
@@ -239,6 +244,12 @@ import moment from 'moment'
             dataIndex: 'responsibilityPerson3',
             width:85
           },
+          {
+            title:'填报人',
+            align:"center",
+            dataIndex: 'informant',
+            width:85
+          },
 
           {
             title:'计划单号',
@@ -258,13 +269,6 @@ import moment from 'moment'
             dataIndex: 'totalMoney',
             width:80
           },
-          {
-            title:'财务备注',
-            align:"center",
-            dataIndex: 'financeRemark',
-            // customRender: (t) => ellipsis(t),
-            // width:200
-          },
           {
             title:'状态',
             align:"center",

+ 4 - 5
src/views/oa/modules/IncidentTicketModal.vue

@@ -163,7 +163,7 @@
           :columns="incidentTicketChildrenTable.columns"
           :data-source="incidentTicketChildrenTable.dataSource"
          :loading="incidentTicketChildrenTable.loading"
-         :scroll="{x: 1500,y:300 }"
+         :scroll="{x: 1200,y:300 }"
           :pagination="false"
             >
              <!-- 自定义表头 -->
@@ -226,8 +226,8 @@
           </a-col>
           </a-row>
           <a-row :gutter="24">
-            <a-col :span="24" style="height: 125px;">
-            <a-form-model-item label="财务备注" prop="financeRemark" class="nresume" >
+            <a-col :span="24" style="height: 290px;">
+            <a-form-model-item label="财务备注" prop="financeRemark" class="fff" >
               <a-input v-model="formState.financeRemark"  type="textarea"  placeholder="请输入"></a-input>
             </a-form-model-item>
           </a-col>
@@ -335,7 +335,6 @@
             align: "center",
             dataIndex: 'planNumber',
             width: '7%',
-            // scopedSlots: { customRender: 'planNumber' },
           },
           {
             title: '事故类型',
@@ -355,7 +354,7 @@
             // title: '汇率',
             align: "center",
             dataIndex: 'exchangeRate',
-            width: '9%',
+            width: '10%',
             scopedSlots: { customRender: 'exchangeRate' },
             slots:{title:'exchangeRateTitle'},
           },

+ 5 - 5
src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -222,8 +222,8 @@
          
           </a-row>
           <a-row :gutter="24">
-          <a-col :span="24" style="height: 110px;">
-            <a-form-model-item label="财务备注" prop="financeRemark" class="nresume">
+          <a-col :span="24" style="height: 290px;">
+            <a-form-model-item label="财务备注" prop="financeRemark" class="fff">
               <a-input v-model="formState.financeRemark"  type="textarea"  placeholder="请输入" readOnly></a-input>
             </a-form-model-item>
           </a-col>          
@@ -551,7 +551,7 @@
              this.accessory2 = this.formState.accessory2?JSON.parse(this.formState.accessory2):[]
              var accessory2Z =[]
              this.accessory2.map(item=>{
-              accessory2Z.push(item.name)
+              accessory2Z.push(item.url)
              })
              this.accessory2 = accessory2Z
 
@@ -559,14 +559,14 @@
              var accessoryZ=[]
 
              this.accessory.map(item =>{
-              accessoryZ.push(item.name)
+              accessoryZ.push(item.url)
              })
              this.accessory =accessoryZ
 
              this.factorySignature = this.formState.factorySignature?JSON.parse(this.formState.factorySignature):[]
              var factorySignatureZ=[]
              this.factorySignature.map(item =>{
-              factorySignatureZ.push(item.name)
+              factorySignatureZ.push(item.url)
              })
              this.factorySignature =factorySignatureZ