|  | @@ -140,25 +140,21 @@
 | 
											
												
													
														|  |            </a-col>
 |  |            </a-col>
 | 
											
												
													
														|  |            <a-col :span="8" >
 |  |            <a-col :span="8" >
 | 
											
												
													
														|  |              <a-form-model-item label="业务员" prop="businessPeople" >
 |  |              <a-form-model-item label="业务员" prop="businessPeople" >
 | 
											
												
													
														|  | -              <a-input v-model="formState.businessPeople"    placeholder="请输入" readOnly></a-input>
 |  | 
 | 
											
												
													
														|  | 
 |  | +              <j-search-select-tag v-model="formState.businessPeople" placeholder="" 
 | 
											
												
													
														|  | 
 |  | +                   dict="sys_user,realname,username" @search="searchName" :disabled="true"/>
 | 
											
												
													
														|  |              </a-form-model-item>
 |  |              </a-form-model-item>
 | 
											
												
													
														|  |            </a-col>
 |  |            </a-col>
 | 
											
												
													
														|  |            <a-col :span="8" >
 |  |            <a-col :span="8" >
 | 
											
												
													
														|  |              <a-form-model-item label="QC" prop="qualityControl">
 |  |              <a-form-model-item label="QC" prop="qualityControl">
 | 
											
												
													
														|  | -              <a-input v-model="formState.qualityControl"   placeholder="请输入" readOnly></a-input>
 |  | 
 | 
											
												
													
														|  | 
 |  | +              <j-search-select-tag v-model="formState.qualityControl" placeholder="" 
 | 
											
												
													
														|  | 
 |  | +                   dict="sys_user,realname,username" @search="searchName" :disabled="true"/>
 | 
											
												
													
														|  |              </a-form-model-item>
 |  |              </a-form-model-item>
 | 
											
												
													
														|  |            </a-col>
 |  |            </a-col>
 | 
											
												
													
														|  |            </a-row>
 |  |            </a-row>
 | 
											
												
													
														|  |            <a-row :gutter="24">
 |  |            <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-col :span="8" >
 | 
											
												
													
														|  |              <a-form-model-item label="附件上传" prop="accessory" class="ff">
 |  |              <a-form-model-item label="附件上传" prop="accessory" class="ff">
 | 
											
												
													
														|  | -              <j-upload  v-model="formState.accessory"  :disabled="true"></j-upload>
 |  | 
 | 
											
												
													
														|  | 
 |  | +              <j-upload  v-model="accessory"  :disabled="true"></j-upload>
 | 
											
												
													
														|  |              </a-form-model-item>
 |  |              </a-form-model-item>
 | 
											
												
													
														|  |            </a-col>
 |  |            </a-col>
 | 
											
												
													
														|  |            
 |  |            
 | 
											
										
											
												
													
														|  | @@ -215,7 +211,7 @@
 | 
											
												
													
														|  |            <a-row :gutter="24">
 |  |            <a-row :gutter="24">
 | 
											
												
													
														|  |              <a-col :span="8">
 |  |              <a-col :span="8">
 | 
											
												
													
														|  |              <a-form-model-item label="添加附件" prop="accessory2" class="ff">
 |  |              <a-form-model-item label="添加附件" prop="accessory2" class="ff">
 | 
											
												
													
														|  | -              <j-upload  v-model="formState.accessory2"  ></j-upload>
 |  | 
 | 
											
												
													
														|  | 
 |  | +              <j-upload  v-model="accessory2"  ></j-upload>
 | 
											
												
													
														|  |                <!-- <a-input v-model="formState.accessory2"  placeholder="请输入"></a-input> -->
 |  |                <!-- <a-input v-model="formState.accessory2"  placeholder="请输入"></a-input> -->
 | 
											
												
													
														|  |              </a-form-model-item>
 |  |              </a-form-model-item>
 | 
											
												
													
														|  |            </a-col>
 |  |            </a-col>
 | 
											
										
											
												
													
														|  | @@ -233,7 +229,7 @@
 | 
											
												
													
														|  |            </a-col>
 |  |            </a-col>
 | 
											
												
													
														|  |            <a-col :span="8" >
 |  |            <a-col :span="8" >
 | 
											
												
													
														|  |                <a-form-model-item label="工厂签章" prop="factorySignature" class="ff">
 |  |                <a-form-model-item label="工厂签章" prop="factorySignature" class="ff">
 | 
											
												
													
														|  | -              <j-upload  v-model="formState.factorySignature"  :disabled="true"></j-upload>
 |  | 
 | 
											
												
													
														|  | 
 |  | +              <j-upload  v-model="factorySignature"  :disabled="true"></j-upload>
 | 
											
												
													
														|  |              </a-form-model-item>
 |  |              </a-form-model-item>
 | 
											
												
													
														|  |            </a-col>
 |  |            </a-col>
 | 
											
												
													
														|  |            </a-row>
 |  |            </a-row>
 | 
											
										
											
												
													
														|  | @@ -385,7 +381,9 @@
 | 
											
												
													
														|  |          refKeys: ['incidentTicketChildren', ],
 |  |          refKeys: ['incidentTicketChildren', ],
 | 
											
												
													
														|  |          tableKeys:['incidentTicketChildren', ],
 |  |          tableKeys:['incidentTicketChildren', ],
 | 
											
												
													
														|  |          activeKey: 'incidentTicketChildren',
 |  |          activeKey: 'incidentTicketChildren',
 | 
											
												
													
														|  | -        accessory2:'',
 |  | 
 | 
											
												
													
														|  | 
 |  | +        accessory2:[],
 | 
											
												
													
														|  | 
 |  | +        accessory:[],
 | 
											
												
													
														|  | 
 |  | +        factorySignature:[],
 | 
											
												
													
														|  |          // 森_工厂质量事故单-子表
 |  |          // 森_工厂质量事故单-子表
 | 
											
												
													
														|  |          incidentTicketChildrenTable: {
 |  |          incidentTicketChildrenTable: {
 | 
											
												
													
														|  |            loading: false,
 |  |            loading: false,
 | 
											
										
											
												
													
														|  | @@ -466,26 +464,27 @@
 | 
											
												
													
														|  |            if(res.success){
 |  |            if(res.success){
 | 
											
												
													
														|  |              var zhuId = '' //主表id
 |  |              var zhuId = '' //主表id
 | 
											
												
													
														|  |               this.formState=res.result //详情
 |  |               this.formState=res.result //详情
 | 
											
												
													
														|  | -             this.formState.accessory2 = this.formState.accessory2?JSON.parse(this.formState.accessory2):[]
 |  | 
 | 
											
												
													
														|  | -             var accessory2 =[]
 |  | 
 | 
											
												
													
														|  | -             this.formState.accessory2.map(item=>{
 |  | 
 | 
											
												
													
														|  | -              accessory2.push(item.name)
 |  | 
 | 
											
												
													
														|  | 
 |  | +             this.accessory2 = this.formState.accessory2?JSON.parse(this.formState.accessory2):[]
 | 
											
												
													
														|  | 
 |  | +             var accessory2Z =[]
 | 
											
												
													
														|  | 
 |  | +             this.accessory2.map(item=>{
 | 
											
												
													
														|  | 
 |  | +              accessory2Z.push(item.name)
 | 
											
												
													
														|  |               })
 |  |               })
 | 
											
												
													
														|  | -             this.formState.accessory2 = this.accessory2
 |  | 
 | 
											
												
													
														|  | -             this.formState.accessory = this.formState.accessory?JSON.parse(this.formState.accessory):[]
 |  | 
 | 
											
												
													
														|  | -             var accessory=[]
 |  | 
 | 
											
												
													
														|  | 
 |  | +             this.accessory2 = accessory2Z
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +             this.accessory = this.formState.accessory?JSON.parse(this.formState.accessory):[]
 | 
											
												
													
														|  | 
 |  | +             var accessoryZ=[]
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -             this.formState.accessory.map(item =>{
 |  | 
 | 
											
												
													
														|  | -              accessory.push(item.name)
 |  | 
 | 
											
												
													
														|  | 
 |  | +             this.accessory.map(item =>{
 | 
											
												
													
														|  | 
 |  | +              accessoryZ.push(item.name)
 | 
											
												
													
														|  |               })
 |  |               })
 | 
											
												
													
														|  | -             this.formState.accessory =accessory
 |  | 
 | 
											
												
													
														|  | 
 |  | +             this.accessory =accessoryZ
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -             this.formState.factorySignature = this.formState.factorySignature?JSON.parse(this.formState.factorySignature):[]
 |  | 
 | 
											
												
													
														|  | -             var factorySignature=[]
 |  | 
 | 
											
												
													
														|  | -             this.formState.factorySignature.map(item =>{
 |  | 
 | 
											
												
													
														|  | -              factorySignature.push(item.name)
 |  | 
 | 
											
												
													
														|  | 
 |  | +             this.factorySignature = this.formState.factorySignature?JSON.parse(this.formState.factorySignature):[]
 | 
											
												
													
														|  | 
 |  | +             var factorySignatureZ=[]
 | 
											
												
													
														|  | 
 |  | +             this.factorySignature.map(item =>{
 | 
											
												
													
														|  | 
 |  | +              factorySignatureZ.push(item.name)
 | 
											
												
													
														|  |               })
 |  |               })
 | 
											
												
													
														|  | -             this.formState.factorySignature =factorySignature
 |  | 
 | 
											
												
													
														|  | 
 |  | +             this.factorySignature =factorySignatureZ
 | 
											
												
													
														|  |               zhuId = res.result.id
 |  |               zhuId = res.result.id
 | 
											
												
													
														|  |               this.getTable(zhuId)
 |  |               this.getTable(zhuId)
 | 
											
												
													
														|  |               this.getNotifier(zhuId)
 |  |               this.getNotifier(zhuId)
 | 
											
										
											
												
													
														|  | @@ -517,12 +516,8 @@
 | 
											
												
													
														|  |          })
 |  |          })
 | 
											
												
													
														|  |        },
 |  |        },
 | 
											
												
													
														|  |        handleOk(){
 |  |        handleOk(){
 | 
											
												
													
														|  | -        this.$refs.form.validate(async valid => {
 |  | 
 | 
											
												
													
														|  | -         if(valid){
 |  | 
 | 
											
												
													
														|  | -          this.formState.accessory2 = [{"type":"file","name":this.formState.accessory2,"status":"done","uid":1673507319016,"url":"http://220.191.168.86:18087/jeecg-boot/sys/common/static/"+this.formState.accessory2}]
 |  | 
 | 
											
												
													
														|  | 
 |  | +          this.formState.accessory2 = [{"type":"file","name":this.accessory2,"status":"done","uid":1673507319016,"url":"http://220.191.168.86:18087/jeecg-boot/sys/common/static/"+this.accessory2}]
 | 
											
												
													
														|  |            this.formState.accessory2 = JSON.stringify(this.formState.accessory2)
 |  |            this.formState.accessory2 = JSON.stringify(this.formState.accessory2)
 | 
											
												
													
														|  | -          this.formState.factorySignature = JSON.stringify(this.formState.factorySignature)
 |  | 
 | 
											
												
													
														|  | -          this.formState.accessory = JSON.stringify(this.formState.accessory)
 |  | 
 | 
											
												
													
														|  |              var obj = this.formState
 |  |              var obj = this.formState
 | 
											
												
													
														|  |              obj.incidentTicketChildrenList =  this.incidentTicketChildrenTable.dataSource 
 |  |              obj.incidentTicketChildrenList =  this.incidentTicketChildrenTable.dataSource 
 | 
											
												
													
														|  |                  putAction('/oa/incidentTicket/edit', obj).then((res) => {
 |  |                  putAction('/oa/incidentTicket/edit', obj).then((res) => {
 | 
											
										
											
												
													
														|  | @@ -534,8 +529,6 @@
 | 
											
												
													
														|  |                         this.$message.warning(res.message)
 |  |                         this.$message.warning(res.message)
 | 
											
												
													
														|  |                       }
 |  |                       }
 | 
											
												
													
														|  |                   })
 |  |                   })
 | 
											
												
													
														|  | -            } 
 |  | 
 | 
											
												
													
														|  | -         })
 |  | 
 | 
											
												
													
														|  |         
 |  |         
 | 
											
												
													
														|  |        },
 |  |        },
 | 
											
												
													
														|  |         //关闭
 |  |         //关闭
 |