Browse Source

森语-事故处理单

jbb 2 years ago
parent
commit
01705e76ab

+ 15 - 1
src/views/oa/IncidentTicketList.vue

@@ -36,6 +36,7 @@
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="单价状态">
                 <a-select placeholder="" v-model="queryParam.state">
+                  <a-select-option value="">请选择</a-select-option>
                   <a-select-option value="1">未处理</a-select-option>
                   <a-select-option value="2">已通知</a-select-option>
                   <a-select-option value="3">已反馈通知</a-select-option>
@@ -167,6 +168,8 @@
   import {filterObj, cloneObject, pushIfNotExist } from '@/utils/util'
   import JEllipsis from '@/components/jeecg/JEllipsis'
  import JInput from '@/components/jeecg/JInput'
+import moment from 'moment'
+
   export default {
     name: "IncidentTicketList",
     mixins:[JeecgListMixin],
@@ -175,7 +178,8 @@
       IncidentTicketModal,
       IncidentTicketModalDetail,
       JEllipsis,
-      JInput
+      JInput,
+      moment
     },
     data () {
       let ellipsis = (v, l = 15) => <j-ellipsis value={v} length={l} /> // 省略
@@ -287,6 +291,16 @@
     created(){
       this.dataSource.push({accidentTheme:''})
     },
+    watch:{
+      dataSource:{
+        immediate:true,
+        handler(newVlue) {
+          newVlue.map(item=>{
+            item.accidentData = moment(item.accidentData).format('YYYY-MM-DD');
+          })
+        },
+      }
+    },
     computed: {
       importExcelUrl: function(){
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;

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

@@ -217,6 +217,11 @@
             <a-form-model-item label="附件上传" prop="accessory" class="ff">
               <j-upload  v-model="accessory"  :disabled="true"></j-upload>
             </a-form-model-item>
+            <a-col :span="8" >
+              <a-form-model-item label="工厂签章" prop="factorySignature" class="ff">
+              <j-upload  v-model="factorySignature"  :disabled="true"></j-upload>
+            </a-form-model-item>
+          </a-col>
           </a-col>
           </a-row>
           <a-row :gutter="24">
@@ -245,11 +250,7 @@
               <a-input v-model="formState.informant"   placeholder="请输入" readOnly></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="8" >
-              <a-form-model-item label="工厂签章" prop="factorySignature" class="ff">
-              <j-upload  v-model="factorySignature"  :disabled="true"></j-upload>
-            </a-form-model-item>
-          </a-col>
+          
           </a-row>
          </a-form-model>
           <!-- <j-editable-table

+ 7 - 6
src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -214,6 +214,11 @@
             <a-form-model-item label="附件上传" prop="accessory" class="ff">
               <j-upload  v-model="accessory"  :disabled="true"></j-upload>
             </a-form-model-item>
+            <a-col :span="8" >
+              <a-form-model-item label="工厂签章" prop="factorySignature" class="ff">
+              <j-upload  v-model="factorySignature"  :disabled="true"></j-upload>
+            </a-form-model-item>
+          </a-col>
           </a-col>
           </a-row>
           <a-row :gutter="24">
@@ -242,11 +247,7 @@
               <a-input v-model="formState.informant"   placeholder="请输入" readOnly></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="8" >
-              <a-form-model-item label="工厂签章" prop="factorySignature" class="ff">
-              <j-upload  v-model="factorySignature"  :disabled="true"></j-upload>
-            </a-form-model-item>
-          </a-col>
+          
           </a-row>
         </a-form-model>
 
@@ -606,7 +607,7 @@
       handleCancelPop(data){
         if(data=='visibleFk') this.visibleFk = false
         if(data=='visibleTs') this.visibleTs = false
-        if(data=='visibleTs') this.visibleTs = false
+        if(data=='visibleWj') this.visibleWj = false
       },
       // getAllTable() {
       //   let values = this.tableKeys.map(key => getRefPromise(this, key))