出入审批 调整

src/views/core/outIn/letter/dialog.addletter.vue

@@ -40,7 +40,7 @@
                 <el-input
                   v-model="formData.reasons"
                   placeholder="请输入出入事由"
-                  maxlength="100"
+                  maxlength="28"
                 />
               </el-form-item>
             </el-col>

src/views/core/outIn/outInLog/dialog.approve.request.vue

@@ -15,7 +15,7 @@
           label-suffix=":"
         >
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item label="介绍信类型">
               <dict-tag :options="dict.type.out_in_type" :value="formData.letterType"/>
               </el-form-item>
@@ -30,21 +30,21 @@
                 {{formData.orgName}}
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="出入事由">
-              {{formData.letterReasons}}
-              </el-form-item>
-            </el-col>
             <el-col :span="12">
               <el-form-item  label="介绍信有效期">
               {{formData.startTimeStr+'~'+formData.endTimeStr}}
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
+              <el-form-item label="出入事由">
+              {{formData.letterReasons}}
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="12">
               <el-form-item  label="有效天数">
                 {{ formData.effectiveDays}}
               </el-form-item>
-            </el-col>
+            </el-col> -->
 
             <el-col :span="24">
               <el-form-item label="介绍信附件">
@@ -69,7 +69,7 @@
           </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" />
+                  <el-table-column label="申请单位" width="250" align="center" prop="companyName" />
                   <el-table-column label="出入人员" width="100" align="center" prop="userName" />
                   <el-table-column label="证件类型" width="100" align="center" prop="idType">
                     <template slot-scope="scope">
@@ -95,11 +95,11 @@
           <el-row>
             <el-col :span="12">
               <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" @change="handleApproveStatusChange" label="1">同意</el-radio>
+                <el-radio v-model="formData.approveStatus" @change="handleApproveStatusChange" label="2">不同意</el-radio>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="formData.approveStatus=='2'">
               <el-form-item label="审批说明" prop="approveRemark">
                 <el-input
                   v-model="formData.approveRemark"
@@ -171,6 +171,15 @@ export default {
         ...other,
       };
     },
+    handleApproveStatusChange(value) {
+        // 当状态切换为 '1' (同意) 时，清空审批说明
+        if (value === '1') {
+            this.formData.approveRemark = '';
+            // 可选：如果需要，也可以清除校验状态
+            // this.$refs.form.clearValidate('approveRemark');
+        }
+        // 注意：当切换为 '2' (不同意) 时，我们不主动清空，保留用户输入
+    },
     // checkApprove(rule,value,callback)
     // {
     //   console.log("checkApprove rule",rule);
@@ -192,12 +201,6 @@ export default {
           this.formFileListDefualtValue=this.formData.letterFile;
         });
       }
-      else
-      {
-        this.isShow = true;
-        this.title = "录入介绍信";
-        this.formData = this.reset();
-      }
     },
     handleAddUser() {
       this.open = true;
@@ -240,6 +243,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          if (this.formData.approveStatus === '2' && !this.formData.approveRemark) {
+            this.$message.error("请填写审批说明");
+            return;
+          }
           let  {approveRemark,approveStatus,id,approveSignImg} = this.formData;
           let tempRquest={approveRemark,approveStatus,id:id,approveSignImg};
 

src/views/core/outIn/outInLog/dialog.outIn.detail.vue

@@ -32,9 +32,9 @@
              +'~' + formData.endTime
           }}</el-descriptions-item>
          
-          <el-descriptions-item label="有效天数">{{
+          <!-- <el-descriptions-item label="有效天数">{{
             formData.effectiveDays
-          }}</el-descriptions-item>
+          }}</el-descriptions-item> -->
            <el-descriptions-item label="申请时间">{{
             formData.createTime
           }}</el-descriptions-item>