|  | @@ -40,13 +40,13 @@
 | 
	
		
			
				|  |  |                {{formData.startTimeStr}}
 | 
	
		
			
				|  |  |                </el-form-item>
 | 
	
		
			
				|  |  |              </el-col>
 | 
	
		
			
				|  |  | -           
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <el-col :span="12">
 | 
	
		
			
				|  |  |                <el-form-item  label="有效天数">
 | 
	
		
			
				|  |  |                  {{ formData.effectiveDays}}
 | 
	
		
			
				|  |  |                </el-form-item>
 | 
	
		
			
				|  |  |              </el-col>
 | 
	
		
			
				|  |  | -            
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <el-col :span="12">
 | 
	
		
			
				|  |  |                <el-form-item label="介绍信附件">
 | 
	
		
			
				|  |  |                  <K-file-upload ref="upload" :isShowUploadBtn="false"
 | 
	
	
		
			
				|  | @@ -58,7 +58,7 @@
 | 
	
		
			
				|  |  |                <el-form-item label="备注" prop="letterNo">
 | 
	
		
			
				|  |  |                  {{formData.letterDescription}}
 | 
	
		
			
				|  |  |                </el-form-item>
 | 
	
		
			
				|  |  | -            </el-col>          
 | 
	
		
			
				|  |  | +            </el-col>
 | 
	
		
			
				|  |  |            </el-row>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |            <el-row :gutter="10" >
 | 
	
	
		
			
				|  | @@ -66,9 +66,9 @@
 | 
	
		
			
				|  |  |                  <h3>
 | 
	
		
			
				|  |  |                    <i class="el-icon-collection-tag"></i>
 | 
	
		
			
				|  |  |                    人员信息
 | 
	
		
			
				|  |  | -                </h3> 
 | 
	
		
			
				|  |  | -            </el-col>              
 | 
	
		
			
				|  |  | -          </el-row>   
 | 
	
		
			
				|  |  | +                </h3>
 | 
	
		
			
				|  |  | +            </el-col>
 | 
	
		
			
				|  |  | +          </el-row>
 | 
	
		
			
				|  |  |            <el-table border size="small" :data="formData.userInfos" height="300">
 | 
	
		
			
				|  |  |                    <el-table-column label="序号"  align="center"  type="index" width="70" />
 | 
	
		
			
				|  |  |                    <el-table-column label="来访单位" width="100" align="center" prop="companyName" />
 | 
	
	
		
			
				|  | @@ -81,28 +81,28 @@
 | 
	
		
			
				|  |  |                    <el-table-column label="证件号码" width="200" align="center" prop="idCard">
 | 
	
		
			
				|  |  |                    </el-table-column>
 | 
	
		
			
				|  |  |                    <el-table-column label="证件图片" align="center" prop="imgFile">
 | 
	
		
			
				|  |  | -                    <template slot-scope="scope">                      
 | 
	
		
			
				|  |  | -                            <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>                  
 | 
	
		
			
				|  |  | -                          </template> 
 | 
	
		
			
				|  |  | -                    </el-table-column>             
 | 
	
		
			
				|  |  | -          </el-table>      
 | 
	
		
			
				|  |  | +                    <template slot-scope="scope">
 | 
	
		
			
				|  |  | +                            <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>
 | 
	
		
			
				|  |  | +                          </template>
 | 
	
		
			
				|  |  | +                    </el-table-column>
 | 
	
		
			
				|  |  | +          </el-table>
 | 
	
		
			
				|  |  |            <el-row :gutter="10">
 | 
	
		
			
				|  |  |              <el-col :span="12">
 | 
	
		
			
				|  |  |                  <h3>
 | 
	
		
			
				|  |  |                    <i class="el-icon-collection-tag"></i>
 | 
	
		
			
				|  |  |                    审批信息
 | 
	
		
			
				|  |  | -                </h3> 
 | 
	
		
			
				|  |  | -            </el-col>              
 | 
	
		
			
				|  |  | -          </el-row>    
 | 
	
		
			
				|  |  | +                </h3>
 | 
	
		
			
				|  |  | +            </el-col>
 | 
	
		
			
				|  |  | +          </el-row>
 | 
	
		
			
				|  |  |            <el-row>
 | 
	
		
			
				|  |  |              <el-col :span="12">
 | 
	
		
			
				|  |  | -              <el-form-item label="审批操作" prop="approveStatus">    
 | 
	
		
			
				|  |  | +              <el-form-item label="审批操作" prop="approveStatus">
 | 
	
		
			
				|  |  |                  <el-radio v-model="formData.approveStatus" label="1">同意</el-radio>
 | 
	
		
			
				|  |  | -                <el-radio v-model="formData.approveStatus" label="2">不同意</el-radio>           
 | 
	
		
			
				|  |  | +                <el-radio v-model="formData.approveStatus" label="2">不同意</el-radio>
 | 
	
		
			
				|  |  |                </el-form-item>
 | 
	
		
			
				|  |  |              </el-col>
 | 
	
		
			
				|  |  |              <el-col :span="12">
 | 
	
		
			
				|  |  | -              <el-form-item label="审批说明" prop="approveRemark"> 
 | 
	
		
			
				|  |  | +              <el-form-item label="审批说明" prop="approveRemark">
 | 
	
		
			
				|  |  |                  <el-input
 | 
	
		
			
				|  |  |                    v-model="formData.approveRemark"
 | 
	
		
			
				|  |  |                    placeholder="请输入审批说明"
 | 
	
	
		
			
				|  | @@ -141,7 +141,7 @@ export default {
 | 
	
		
			
				|  |  |        title: "来访事项审批",
 | 
	
		
			
				|  |  |        formData: this.reset(),
 | 
	
		
			
				|  |  |        formDataRules: {
 | 
	
		
			
				|  |  | -        approveStatus: [{ required: true, message: "请勾选审批结果" }],        
 | 
	
		
			
				|  |  | +        approveStatus: [{ required: true, message: "请勾选审批结果" }],
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |        formFileListDefualtValue: [],
 | 
	
		
			
				|  |  |      };
 | 
	
	
		
			
				|  | @@ -157,6 +157,7 @@ export default {
 | 
	
		
			
				|  |  |      ...mapMutations([]),
 | 
	
		
			
				|  |  |      reset(other = {}) {
 | 
	
		
			
				|  |  |        return {
 | 
	
		
			
				|  |  | +        id: null,
 | 
	
		
			
				|  |  |          reasons: null,
 | 
	
		
			
				|  |  |          letterNo:null,
 | 
	
		
			
				|  |  |          receptionOrgIds: [],
 | 
	
	
		
			
				|  | @@ -167,6 +168,7 @@ export default {
 | 
	
		
			
				|  |  |          type:null,
 | 
	
		
			
				|  |  |          approveRemark:null,
 | 
	
		
			
				|  |  |          approveStatus:null,
 | 
	
		
			
				|  |  | +        approveSignImg:null,
 | 
	
		
			
				|  |  |          ...other,
 | 
	
		
			
				|  |  |        };
 | 
	
		
			
				|  |  |      },
 | 
	
	
		
			
				|  | @@ -176,9 +178,9 @@ export default {
 | 
	
		
			
				|  |  |      //   console.log("checkApprove value",value);
 | 
	
		
			
				|  |  |      //   console.log("checkApprove callback",callback);
 | 
	
		
			
				|  |  |      // },
 | 
	
		
			
				|  |  | -    async show(id, other = {}) {     
 | 
	
		
			
				|  |  | +    async show(id, signImg,other = {}) {
 | 
	
		
			
				|  |  |        if (id) {
 | 
	
		
			
				|  |  | -        this.title = "来访事项审批";   
 | 
	
		
			
				|  |  | +        this.title = "来访事项审批";
 | 
	
		
			
				|  |  |          this.isShow = true;
 | 
	
		
			
				|  |  |          getOutInRequest(id).then((response) => {
 | 
	
		
			
				|  |  |            // let tempRange=[];
 | 
	
	
		
			
				|  | @@ -186,14 +188,16 @@ export default {
 | 
	
		
			
				|  |  |            // tempRange.push(new Date(response.data.endTime));
 | 
	
		
			
				|  |  |            // response.data.range=tempRange;
 | 
	
		
			
				|  |  |            this.formData = response.data;
 | 
	
		
			
				|  |  | +          this.formData.approveStatus = "1";
 | 
	
		
			
				|  |  | +          this.formData.approveSignImg = signImg;
 | 
	
		
			
				|  |  |            this.formFileListDefualtValue=this.formData.letterFile;
 | 
	
		
			
				|  |  | -        });        
 | 
	
		
			
				|  |  | +        });
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      else 
 | 
	
		
			
				|  |  | +      else
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          this.isShow = true;
 | 
	
		
			
				|  |  |          this.title = "录入介绍信";
 | 
	
		
			
				|  |  | -        this.formData = this.reset();       
 | 
	
		
			
				|  |  | +        this.formData = this.reset();
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      handleAddUser() {
 | 
	
	
		
			
				|  | @@ -233,14 +237,13 @@ export default {
 | 
	
		
			
				|  |  |        this.formData = this.reset();
 | 
	
		
			
				|  |  |        this.$refs["upload"].clearFiles();
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | -    
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      submitForm() {
 | 
	
		
			
				|  |  |        this.$refs["form"].validate((valid) => {
 | 
	
		
			
				|  |  | -        if (valid) {         
 | 
	
		
			
				|  |  | -          let  {approveRemark,approveStatus,approveLog} = this.formData;
 | 
	
		
			
				|  |  | -          let tempRquest={approveRemark,approveStatus,id:approveLog.id};
 | 
	
		
			
				|  |  | +        if (valid) {
 | 
	
		
			
				|  |  | +          let  {approveRemark,approveStatus,id,approveSignImg} = this.formData;
 | 
	
		
			
				|  |  | +          let tempRquest={approveRemark,approveStatus,id:id,approveSignImg};
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -          console.log("================",tempRquest );          
 | 
	
		
			
				|  |  |            approveLetter(tempRquest).then((response) => {
 | 
	
		
			
				|  |  |                this.$modal.msgSuccess("提交成功");
 | 
	
		
			
				|  |  |                this.isShow = false;
 | 
	
	
		
			
				|  | @@ -249,7 +252,7 @@ export default {
 | 
	
		
			
				|  |  |              });
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  | -    },   
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    mounted() {},
 | 
	
		
			
				|  |  |  };
 |