森语-质量事故单

src/views/oa/IncidentTicketList.vue

@@ -5,24 +5,34 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="质量事故单主题">
-              <a-input placeholder="请输入质量事故单主题" v-model="queryParam.accidentTheme"></a-input>
+            <a-form-item label="事故单号">
+              <a-input placeholder="请输入事故单号" v-model="queryParam.accidentNumber"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="款号">
-              <a-input placeholder="请输入款号" v-model="queryParam.styleNumber"></a-input>
+            <a-form-item label="责任单位">
+              <a-input placeholder="请输入责任单位" v-model="queryParam.responsibilityCompany"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="填报人">
+              <j-dict-select-tag placeholder="请选择填报人" v-model="queryParam.informant" dictCode="sys_user ,realname,username"/>
+            </a-form-item>
+          </a-col>
+          
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="业务员">
-                <j-dict-select-tag placeholder="请选择业务员" v-model="queryParam.businessPeople" dictCode="sys_user,realname,username"/>
+              <a-form-item label="计划单号">
+                <!-- <j-dict-select-tag placeholder="请选择业务员" v-model="queryParam.businessPeople" dictCode="sys_user,realname,username"/> -->
+                <a-input placeholder="请输入计划单号" v-model="queryParam.planNumber"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="填报人">
-                <j-dict-select-tag placeholder="请选择填报人" v-model="queryParam.informant" dictCode="sys_user ,realname,username"/>
+              <a-form-item label="质量事故单主题">
+                <a-input placeholder="请输入质量事故单主题" v-model="queryParam.accidentTheme"></a-input>
+              </a-form-item>
+               <a-form-item label="财务备注">
+                <a-input placeholder="请输入财务备注" v-model="queryParam.financeRemark"></a-input>
               </a-form-item>
             </a-col>
           </template>
@@ -158,29 +168,50 @@
             align:"center",
             dataIndex: 'accidentData'
           },
+          {
+            title:'质量事故单号',
+            align:"center",
+            dataIndex: 'accidentNumber'
+          },
           {
             title:'质量事故单主题',
             align:"center",
             dataIndex: 'accidentTheme'
           },
           {
-            title:'事故责任人',
+            title:'责任单位',
             align:"center",
-            dataIndex: 'accidentPersonLiable'
+            dataIndex: 'responsibilityCompany'
           },
           {
-            title:'质量事故单号',
+            title:'责任人1',
             align:"center",
-            dataIndex: 'accidentNumber'
+            dataIndex: 'responsibilityPerson1'
           },
           {
-            title:'总金额',
+            title:'责任人2',
+            align:"center",
+            dataIndex: 'responsibilityPerson2'
+          },
+          {
+            title:'责任人3',
             align:"center",
-            dataIndex: 'totalMoney'
+            dataIndex: 'responsibilityPerson3'
           },
+
           {
-            title:'业务类型',
+            title:'计划单号',
             align:"center",
+            dataIndex: 'planNumber'
+          },
+          {
+            title:'款号',
+            align:"styleNumber",
+            dataIndex: 'businessType'
+          },
+          {
+            title:'总金额',
+            align:"totalMoney",
             dataIndex: 'businessType'
           },
           {

src/views/oa/modules/IncidentTicketModal.vue

@@ -10,9 +10,158 @@
     <a-spin :spinning="confirmLoading">
       <!-- 主表单区域 -->
       <div class="table-page-search-wrapper">
-        
-
-
+        <div >
+        <a-form-model layout="inline" ref="form" :model="formState" :rules="validatorRules" labelAlign="right">
+          <a-row :gutter="24">
+          <a-col :span="8" >
+            <a-form-model-item label="日期" prop="accidentData" >
+              <a-input v-model="formState.accidentData"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="质量事故单主题" prop="accidentTheme">
+              <a-input v-model="formState.accidentTheme"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="质量事故单号" prop="accidentNumber">
+              <a-input v-model="formState.accidentNumber"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-row :gutter="24">
+          <a-col :span="8" >
+            <a-form-model-item label="客户" prop="customer" >
+              <a-input v-model="formState.customer"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="工厂" prop="factory">
+              <a-input v-model="formState.factory"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="责任单位" prop="responsibilityCompany">
+              <a-input v-model="formState.responsibilityCompany"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          
+          </a-row>
+          <a-divider />
+          <a-row :gutter="24">
+            <a-col :span="6" >
+            <a-form-model-item label="责任人1" prop="responsibilityPerson1" >
+              <a-input v-model="formState.responsibilityPerson1"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="责任人2" prop="responsibilityPerson2" >
+              <a-input v-model="formState.responsibilityPerson2"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="责任人3" prop="responsibilityPerson3">
+              <a-input v-model="formState.responsibilityPerson3"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="责任人4" prop="responsibilityPerson4">
+              <a-input v-model="formState.responsibilityPerson4"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="6" >
+            <a-form-model-item label="金额1" prop="sum1" >
+              <a-input v-model="formState.sum1"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="金额2" prop="sum2" >
+              <a-input v-model="formState.sum2"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="金额3" prop="sum3">
+              <a-input v-model="formState.sum3"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="金额4" prop="sum4">
+              <a-input v-model="formState.sum4"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-divider />
+          <a-row :gutter="24">         
+          <a-col :span="8" >
+            <a-form-model-item label="币种" prop="moneyType">
+              <a-input v-model="formState.moneyType"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="总金额" prop="totalMoney" >
+              <a-input v-model="formState.totalMoney"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="业务类型" prop="businessType">
+              <a-input v-model="formState.businessType"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-row :gutter="24">
+          <a-col :span="8" >
+            <a-form-model-item label="成衣销售订单号" prop="garmentSalesOrder">
+              <a-input v-model="formState.garmentSalesOrder"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="款号" prop="styleNumber" >
+              <a-input v-model="formState.styleNumber"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="物料" prop="material">
+              <a-input v-model="formState.material"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-row :gutter="24">
+          
+          <a-col :span="8" >
+            <a-form-model-item label="计划员" prop="planPersonnel">
+              <a-input v-model="formState.planPersonnel"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="业务员" prop="businessPeople" >
+              <a-input v-model="formState.businessPeople"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="QC" prop="qualityControl">
+              <a-input v-model="formState.qualityControl"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-row :gutter="24">
+          
+          <a-col :span="8" >
+            <a-form-model-item label="计划员" prop="planPersonnel">
+              <a-input v-model="formState.planPersonnel"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="附件上传" prop="accessory" class="ff">
+              <j-upload  v-model="formState.accessory"  :disabled="true"></j-upload>
+            </a-form-model-item>
+          </a-col>
+          
+          </a-row>
+          
+         </a-form-model>
+         </div>
       <!-- 子表单区域 -->
           <!-- <a-button type="primary"  @click="addList" style="margin-bottom: 1%;">增行</a-button> -->
           <a-table
@@ -52,6 +201,11 @@
               <a-input v-model="formState.financeRemark"  type="textarea"  placeholder="请输入"></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24" style="height: 110px;">
+            <a-form-model-item label="情况说明" prop="presentationCondition" class="nresume">
+              <a-input v-model="formState.presentationCondition"  type="textarea"  placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
           
           </a-row>
           <a-row :gutter="24">
@@ -67,6 +221,18 @@
             </a-form-model-item>
           </a-col>
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="8" >
+            <a-form-model-item label="填报人" prop="informant">
+              <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">
+              <a-input v-model="formState.factorySignature"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
          </a-form-model>
           <!-- <j-editable-table
             :ref="refKeys[0]"
@@ -294,8 +460,18 @@
           if(res.success){
             var zhuId = '' //主表id
              this.formState=res.result //详情
-             this.formState.accessory2 = JSON.parse(this.formState.accessory2)
-             this.formState.accessory2=this.formState.accessory2[0].name
+             this.formState.accessory2 = this.formState.accessory2?JSON.parse(this.formState.accessory2):[]
+             var accessory2 =[]
+             this.formState.accessory2.map(item=>{
+              accessory2.push(item.name)
+             })
+             this.formState.accessory2 = this.accessory2
+             this.formState.accessory = this.formState.accessory?JSON.parse(this.formState.accessory):[]
+             var accessory=[]
+             this.formState.accessory.map(item =>{
+              accessory.push(item.name)
+             })
+             this.formState.accessory =accessory
              zhuId = res.result.id
              this.getTable(zhuId)
              this.getNotifier(zhuId)
@@ -396,4 +572,14 @@
 /deep/ .nresume .ant-input{
   height: 100px !important;
 }
+/deep/ .ff .ant-form-item-control {
+  display: table;
+}
+/deep/  .ant-divider-horizontal{
+  margin: 10px 0;
+}
+
+/deep/.table-page-search-wrapper .ant-form-inline .ant-form-item>.ant-form-item-label{
+  width: 118px;
+}
 </style>

src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -24,6 +24,159 @@
     <a-spin :spinning="confirmLoading">
       
       <div class="table-page-search-wrapper">
+        <div >
+        <a-form-model layout="inline" ref="form" :model="formState" :rules="validatorRules" labelAlign="right">
+          <a-row :gutter="24">
+          <a-col :span="8" >
+            <a-form-model-item label="日期" prop="accidentData" >
+              <a-input v-model="formState.accidentData"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="质量事故单主题" prop="accidentTheme">
+              <a-input v-model="formState.accidentTheme"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="质量事故单号" prop="accidentNumber">
+              <a-input v-model="formState.accidentNumber"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-row :gutter="24">
+          <a-col :span="8" >
+            <a-form-model-item label="客户" prop="customer" >
+              <a-input v-model="formState.customer"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="工厂" prop="factory">
+              <a-input v-model="formState.factory"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="责任单位" prop="responsibilityCompany">
+              <a-input v-model="formState.responsibilityCompany"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          
+          </a-row>
+          <a-divider />
+          <a-row :gutter="24">
+            <a-col :span="6" >
+            <a-form-model-item label="责任人1" prop="responsibilityPerson1" >
+              <a-input v-model="formState.responsibilityPerson1"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="责任人2" prop="responsibilityPerson2" >
+              <a-input v-model="formState.responsibilityPerson2"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="责任人3" prop="responsibilityPerson3">
+              <a-input v-model="formState.responsibilityPerson3"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="责任人4" prop="responsibilityPerson4">
+              <a-input v-model="formState.responsibilityPerson4"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="6" >
+            <a-form-model-item label="金额1" prop="sum1" >
+              <a-input v-model="formState.sum1"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="金额2" prop="sum2" >
+              <a-input v-model="formState.sum2"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="金额3" prop="sum3">
+              <a-input v-model="formState.sum3"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="6" >
+            <a-form-model-item label="金额4" prop="sum4">
+              <a-input v-model="formState.sum4"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-divider />
+          <a-row :gutter="24">         
+          <a-col :span="8" >
+            <a-form-model-item label="币种" prop="moneyType">
+              <a-input v-model="formState.moneyType"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="总金额" prop="totalMoney" >
+              <a-input v-model="formState.totalMoney"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="业务类型" prop="businessType">
+              <a-input v-model="formState.businessType"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-row :gutter="24">
+          <a-col :span="8" >
+            <a-form-model-item label="成衣销售订单号" prop="garmentSalesOrder">
+              <a-input v-model="formState.garmentSalesOrder"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="款号" prop="styleNumber" >
+              <a-input v-model="formState.styleNumber"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="物料" prop="material">
+              <a-input v-model="formState.material"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-row :gutter="24">
+          
+          <a-col :span="8" >
+            <a-form-model-item label="计划员" prop="planPersonnel">
+              <a-input v-model="formState.planPersonnel"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="业务员" prop="businessPeople" >
+              <a-input v-model="formState.businessPeople"    placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="QC" prop="qualityControl">
+              <a-input v-model="formState.qualityControl"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
+          <a-row :gutter="24">
+          
+          <a-col :span="8" >
+            <a-form-model-item label="计划员" prop="planPersonnel">
+              <a-input v-model="formState.planPersonnel"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8" >
+            <a-form-model-item label="附件上传" prop="accessory" class="ff">
+              <j-upload  v-model="formState.accessory"  :disabled="true"></j-upload>
+            </a-form-model-item>
+          </a-col>
+          
+          </a-row>
+
+          
+         </a-form-model>
+         </div>
       <!-- 子表单区域 -->
           <!-- <a-button type="primary"  @click="addList" style="margin-bottom: 1%;">增行</a-button> -->
           <a-table
@@ -63,6 +216,11 @@
               <a-input v-model="formState.financeRemark"  type="textarea"  placeholder="请输入" readOnly></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24" style="height: 110px;">
+            <a-form-model-item label="情况说明" prop="presentationCondition" class="nresume">
+              <a-input v-model="formState.presentationCondition"  type="textarea"  placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
           
           </a-row>
           <a-row :gutter="24">
@@ -78,9 +236,21 @@
             </a-form-model-item>
           </a-col>
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="8" >
+            <a-form-model-item label="填报人" prop="informant">
+              <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">
+              <a-input v-model="formState.factorySignature"   placeholder="请输入" readOnly></a-input>
+            </a-form-model-item>
+          </a-col>
+          </a-row>
         </a-form-model>
 
-      <j-select-biz-component   ref="JSelectBizComponent"  :value="value"  :listUrl="url.list"  :columns="columns"  v-on="$listeners"  v-bind="attrs" @send-notice="sendNotice"  />
+      <j-select-biz-component   ref="JSelectBizComponent"  :value="value"  :listUrl="url.list"  :columns="columns"  v-on="$listeners"   @send-notice="sendNotice"  />
     </div>
     </a-spin>
   </a-modal>
@@ -342,8 +512,25 @@
           if(res.success){
             var zhuId = '' //主表id
              this.formState=res.result //详情
+
+             //获取财务上传附件名称
              this.formState.accessory2 = JSON.parse(this.formState.accessory2)
-             this.formState.accessory2=this.formState.accessory2[0].name
+             this.formState.accessory2 = this.formState.accessory2?JSON.parse(this.formState.accessory2):[]
+             var accessory2 =[]
+             this.formState.accessory2.map(item=>{
+              accessory2.push(item.name)
+             })
+             this.formState.accessory2 = this.accessory2
+
+             //获取上传附件名称
+             this.formState.accessory = this.formState.accessory?JSON.parse(this.formState.accessory):[]
+             var accessory=[]
+             this.formState.accessory.map(item =>{
+              accessory.push(item.name)
+             })
+             this.formState.accessory =accessory
+
+             //
              zhuId = res.result.id
              this.getTable(zhuId)
              this.getNotifier(zhuId)
@@ -426,4 +613,11 @@
 /deep/ .nresume .ant-input{
   height: 100px !important;
 }
+/deep/ .ff .ant-form-item-control {
+  display: table;
+}
+
+/deep/.table-page-search-wrapper .ant-form-inline .ant-form-item>.ant-form-item-label{
+  width: 118px;
+}
 </style>