wxd

.env.development

@@ -8,3 +8,7 @@ VITE_APP_ENV = 'development'
 VITE_APP_BASE_API = '/dev-api'
 
 VITE_APP_IMAGURL = 'http://192.168.1.50:8088'
+
+# 秦皇岛 = “xhd” , 衡水 = ‘hs’ , 沧州 = “cz”
+
+VITE_APP_REGION_CONFIG = 'xhd'

src/components/AmatterClass/index.vue

@@ -25,36 +25,14 @@
         </div>
 
         <div class="avater">
-          <!-- <el-descriptions
-            class="avater"
-            style="width: 370px"
-            :column="4"
-            size="large"
-            border
-          >
-            <el-descriptions-item :span="0" style="width: 100px">
-              <template #label>
-                <div
-                  style="height: 100px; line-height: 100px"
-                  class="cell-item"
-                >
-                  <el-icon :style="iconStyle">
-                    <user />
-                  </el-icon>
-                  头像
-                </div>
-                <span class="required">*</span>
-              </template>
-
-            </el-descriptions-item>
-          </el-descriptions> -->
+        
         </div>
 
         <div style="display: flex">
           <el-descriptions
             width="200px"
             class="margin-top"
-            style="margin-bottom: 30px; margin-top: 0px; width: 90%"
+            style="margin-bottom: 0; margin-top: 0px; width: 90%"
             :column="3"
             size="large"
             border
@@ -65,10 +43,15 @@
                 <span class="required">*</span>
               </template>
               <el-form-item prop="chineseName">
+                <span v-if="isDisabled">
+                  {{personDataForm.chineseName}}
+                </span>
                 <el-input
+                  v-else
                   placeholder="请输入中文名"
                   v-model="personDataForm.chineseName"
                 ></el-input>
+                
               </el-form-item>
             </el-descriptions-item>
             <el-descriptions-item>
@@ -77,9 +60,13 @@
               </template>
               <el-form-item>
                 <el-input
+                  v-if="!isDisabled"
                   placeholder="请输入英文名"
                   v-model="personDataForm.englishName"
                 ></el-input>
+                <span v-else>
+                  {{personDataForm.englishName || '无'}}
+                </span>
               </el-form-item>
             </el-descriptions-item>
 
@@ -89,7 +76,11 @@
                 <span class="required">*</span>
               </template>
               <el-form-item prop="gender">
+                <span v-if="isDisabled">
+                  {{personDataForm.gender === '0' ? '男' : '女'}}
+                </span>
                 <el-select
+                  v-else
                   style="width: 100%"
                   placeholder="请选择性别"
                   v-model="personDataForm.gender"
@@ -106,7 +97,11 @@
                 <span class="required">*</span>
               </template>
               <el-form-item>
+                <span v-if="isDisabled">
+                  <dict-tag :options="politics_status" :value="personDataForm.politicsStatus"></dict-tag>
+                </span>
                 <el-select
+                  v-else
                   style="width: 100%"
                   v-model="personDataForm.politicsStatus"
                   placeholder="请选择您的政治面貌"
@@ -128,7 +123,11 @@
                 <span class="required">*</span>
               </template>
               <el-form-item>
+                <span v-if="isDisabled">
+                 {{personDataForm.minZu}}
+                </span>
                 <el-select
+                  v-else
                   style="width: 100%"
                   v-model="personDataForm.minZu"
                   placeholder="请选择所属民族"
@@ -149,7 +148,11 @@
                 <span class="required">*</span>
               </template>
               <el-form-item prop="chuShengDate">
+                <span v-if="isDisabled">  
+                  {{personDataForm.chuShengDate}}
+                </span>
                 <el-date-picker
+                  v-else
                   style="width: 100%"
                   v-model="personDataForm.chuShengDate"
                   type="date"
@@ -165,7 +168,11 @@
                 <div class="cell-item">国籍/籍贯</div>
               </template>
               <el-form-item>
+                <span v-if="isDisabled">
+                  {{personDataForm.jiGuan || '无'}}
+                </span>
                 <el-input
+                  v-else
                   v-model="personDataForm.jiGuan"
                   placeholder="请输入籍贯"
                 ></el-input>
@@ -180,7 +187,14 @@
               <el-form-item prop="juZhuDi">
                 <div style="display: flex; align-items: center; width: 100%">
                   <div style="width: 273px">
+                    <span v-if="isDisabled">
+                     区县： <dict-tag  style="display: inline-block" :options="rclk_dzqx" :value="personDataForm.juZhuDiQu"></dict-tag> 
+                 
+                    本市居住地：{{personDataForm.juZhuDi}}
+                    </span>
+                     
                     <el-select
+                      v-else
                       style="width: 100%"
                       v-model="personDataForm.juZhuDiQu"
                       placeholder="请选择区县"
@@ -195,7 +209,7 @@
                     </el-select>
                   </div>
 
-                  <div style="margin-left: 10px; width: 350px">
+                  <div v-if="!isDisabled" style="margin-left: 10px; width: 350px">
                     <el-input
                       v-model="personDataForm.juZhuDi"
                       placeholder="请输入本市居住地"
@@ -207,6 +221,7 @@
           </el-descriptions>
           <el-form-item style="margin-left: 20px" prop="photoPath">
             <el-upload
+              :disabled="isDisabled"
               :class="{ isUpload: fileList.length }"
               :action="uploadFileUrl"
               v-model:file-list="fileList"
@@ -234,7 +249,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item prop="renCaiType">
+              <span v-if="isDisabled">
+                {{listByCardType.find(item => item.id == personDataForm.renCaiType)?.name || '无'}}
+              </span>
               <el-select
+                v-else
                 style="width: 100%"
                 @change="handleChangeCardType"
                 v-model="personDataForm.renCaiType"
@@ -255,7 +274,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{talentTitle.find(item => item.id == personDataForm.renCaiChengHao)?.name}}
+              </span>
               <el-select
+                v-else
                 style="width: 100%"
                 v-model="personDataForm.renCaiChengHao"
                 placeholder="请选择人才称号"
@@ -276,7 +299,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{personDataForm.getDate}}
+              </span>
               <el-date-picker
+                v-else
                 v-model="personDataForm.getDate"
                 style="width: 100%"
                 type="date"
@@ -292,7 +319,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item prop="zhengJianType">
+              <span v-if="isDisabled">
+                <dict-tag :options="zheng_jian_type" :value="personDataForm.zhengJianType"></dict-tag>
+              </span>
               <el-select
+                v-else
                 style="width: 100%"
                 v-model="personDataForm.zhengJianType"
                 placeholder="请选择证件类别"
@@ -311,9 +342,13 @@
             <template #label>
               <div class="cell-item">证件号码</div>
               <span class="required">*</span>
-            </template>
-            <el-form-item prop="idNum">
+              </template>
+              <el-form-item prop="idNum">
+              <span v-if="isDisabled">
+                {{personDataForm.idNum}}
+              </span>
               <el-input
+                v-else
                 style="width: 288px"
                 v-model="personDataForm.idNum"
                 placeholder="请输入证件号码"
@@ -321,9 +356,10 @@
             </el-form-item>
           </el-descriptions-item>
         </el-descriptions>
+        
         <el-descriptions
           title="毕业院校及学历专业"
-          class="margin-top"
+          class=""
           :column="3"
           size="large"
           border
@@ -334,7 +370,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                <dict-tag :options="xue_li" :value="personDataForm.xueLi"></dict-tag>
+              </span>
               <el-select
+                v-else
                 style="width: 100%"
                 v-model="personDataForm.xueLi"
                 placeholder="请输入学历学位"
@@ -355,9 +395,13 @@
               <span class="required">*</span>
             </template>
             <el-form-item prop="school">
+              <span v-if="isDisabled">
+                {{personDataForm.school}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.school"
-                placeholder="请输入教育经历"
+                placeholder="请输入全日制教育专业"
               ></el-input>
             </el-form-item>
           </el-descriptions-item>
@@ -369,13 +413,21 @@
             </template>
             <div style="display: flex">
               <el-form-item prop="specialty">
+                <span v-if="isDisabled">
+                  {{personDataForm.specialty}}
+                </span>
                 <el-input
+                  v-else
                   v-model="personDataForm.specialty"
                   placeholder="专业"
                 ></el-input>
               </el-form-item>
               <el-form-item style="margin-left: 10px">
+                <span v-if="isDisabled">
+               （ 是否海外： {{personDataForm.isHaiwai ? '是' : '否'}}）
+                </span>
                 <el-checkbox
+                  v-else
                   :true-value="true"
                   :false-value="false"
                   v-model="personDataForm.isHaiwai"
@@ -393,7 +445,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{personDataForm.zhengShuNum}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.zhengShuNum"
                 placeholder="请输入毕业证书编号"
               ></el-input>
@@ -405,9 +461,13 @@
               <div class="cell-item">在职教育</div>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{personDataForm.zaiZhiJiaoYu || '无'}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.zaiZhiJiaoYu"
-                placeholder="学校"
+                placeholder="请输入在职教育学校"
               ></el-input>
             </el-form-item>
           </el-descriptions-item>
@@ -418,10 +478,13 @@
             </template>
             <div style="display: flex">
               <el-form-item>
+                <span v-if="isDisabled">
+                  {{personDataForm.zaiZhiZhuanYe || '无'}}
+                </span>
                 <el-input
-                  style="width: 288px"
+                  v-else
                   v-model="personDataForm.zaiZhiZhuanYe"
-                  placeholder="专业"
+                  placeholder="请输入在职教育专业"
                 ></el-input>
               </el-form-item>
             </div>
@@ -440,7 +503,11 @@
               <div class="cell-item">固定电话</div>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{personDataForm.phoneNum}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.phoneNum"
                 placeholder="请输入固定电话号码"
               ></el-input>
@@ -452,7 +519,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item prop="shouJiNum">
+              <span v-if="isDisabled">
+                {{personDataForm.shouJiNum}}
+              </span>
               <el-input
+                v-else
                 v-model.number="personDataForm.shouJiNum"
                 placeholder="请输入手机号码"
               ></el-input>
@@ -463,7 +534,11 @@
               <div class="cell-item">电子邮箱</div>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{personDataForm.eMail}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.eMail"
                 placeholder="请输入电子邮箱"
               ></el-input>
@@ -484,7 +559,11 @@
               <div class="cell-item">原工作单位职务、职称</div>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{personDataForm.yjrcYuanDanWeiZhiWu || '无'}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.yjrcYuanDanWeiZhiWu"
                 placeholder="请输入原工作单位职务、职称"
               ></el-input>
@@ -495,7 +574,11 @@
               <div class="cell-item">现工作单位职务</div>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{personDataForm.yjrcXianDanWeiZhiWu || '无'}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.yjrcXianDanWeiZhiWu"
                 placeholder="请输入现工作单位职务"
               ></el-input>
@@ -508,7 +591,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item prop="yjrcType">
+              <span v-if="isDisabled">
+                <dict-tag :options="yjrc_type" :value="personDataForm.yjrcType"></dict-tag>
+              </span>
               <el-select
+                v-else
                 style="width: 100%"
                 @change="handelChangeyjrcTypeRules"
                 placeholder="请选择引进人才类型"
@@ -537,6 +624,9 @@
               }}</span>
             </template>
             <el-form-item prop="yjrcQianyueDate" :rules="qyRules">
+              <span v-if="isDisabled">
+                <dict-tag :options="yjrc_qianyue_date" :value="personDataForm.yjrcQianyueDate"></dict-tag>
+              </span>
               <el-select
                 style="width: 288px"
                 v-model="personDataForm.yjrcQianyueDate"
@@ -566,7 +656,11 @@
               >
             </template>
             <el-form-item prop="zzpyZhiWu" :rules="zwRules">
+              <span v-if="isDisabled">
+                {{personDataForm.zzpyZhiWu}}
+              </span>
               <el-input
+                v-else
                 style="width: 288px"
                 placeholder="请输入单位职务职称"
                 v-model="personDataForm.zzpyZhiWu"
@@ -589,7 +683,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item prop="yrdwName">
+              <span v-if="isDisabled">
+                {{personDataForm.yrdwName}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.yrdwName"
                 placeholder="请输入用人单位全称"
               ></el-input>
@@ -601,7 +699,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item prop="yrdwXingZhi">
+              <span v-if="isDisabled">
+                <dict-tag :options="rclk_dwxz" :value="personDataForm.yrdwXingZhi"></dict-tag>
+              </span>
               <el-select
+                v-else
                 style="width: 100%"
                 v-model="personDataForm.yrdwXingZhi"
                 placeholder="请选择单位性质"
@@ -621,12 +723,16 @@
               <span class="required">*</span>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                <dict-tag :options="yrdw_industry_involved" :value="personDataForm.yrdwIndustryInvolved"></dict-tag>
+              </span>
               <el-select
+                v-else
                 style="width: 100%"
                 v-model="personDataForm.yrdwIndustryInvolved"
                 placeholder="请输入所属行业"
               >
-                <el-option
+                <el-option  
                   v-for="item of yrdw_industry_involved"
                   :key="item.id"
                   :value="item.value"
@@ -641,7 +747,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{personDataForm.yrdwFaRen}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.yrdwFaRen"
                 placeholder="请输入单位法人代表"
               ></el-input>
@@ -654,7 +764,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{personDataForm.yrdwLianxiRen}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.yrdwLianxiRen"
                 placeholder="请输入单位联系人"
               ></el-input>
@@ -667,7 +781,11 @@
               <span class="required">*</span>
             </template>
             <el-form-item>
+              <span v-if="isDisabled">
+                {{personDataForm.yrdwPhone}}
+              </span>
               <el-input
+                v-else
                 v-model="personDataForm.yrdwPhone"
                 placeholder="请输入单位联系电话"
               ></el-input>
@@ -679,8 +797,12 @@
               <span class="required">*</span>
             </template>
             <el-form-item prop="yrdwAddress">
-              <div style="display: flex; align-items: center; width: 100%">
+              <div style="display: flex; align-items: center; ">
+                <span style="display:inline-block;" v-if="isDisabled">
+                区县：<dict-tag style="display:inline-block" :options="rclk_dzqx" :value="personDataForm.yrdwAddressArea"></dict-tag>
+                </span>
                 <el-select
+                  v-else
                   v-model="personDataForm.yrdwAddressArea"
                   placeholder="请选择区县"
                   style="width: 288px"
@@ -694,8 +816,14 @@
                   </el-option>
                 </el-select>
 
+
+                <span style="display:inline-block;margin-left:10px" v-if="isDisabled">
+                 用人单位地址：  {{personDataForm.yrdwAddress}}
+                </span>
+
                 <el-input
-                  style="width: 70%; margin-left: 20px"
+                  v-if="!isDisabled"
+                  style="width: 70%; margin-left: 10px"
                   v-model="personDataForm.yrdwAddress"
                   placeholder="请输入用人单位地址"
                 ></el-input>
@@ -705,7 +833,9 @@
         </el-descriptions>
 
         <el-form-item label-width="140px" label="国内外学习工作经历">
-          <editor v-model="personDataForm.jingLi" :min-height="192" />
+          <editor 
+            :readOnly="isDisabled"
+           v-model="personDataForm.jingLi" :min-height="192" />
         </el-form-item>
         <el-form-item
           style="margin-top: 20px"
@@ -713,6 +843,7 @@
           label="成果和奖励情况"
         >
           <editor
+            :readOnly="isDisabled"
             v-model="personDataForm.huojiangCondition"
             :min-height="192"
           />
@@ -721,49 +852,21 @@
       <div></div>
     </div>
 
-    <div v-if="isTableVisilite">
-      <el-table v-loading="materialLoading" :data="materialTable" border>
-        <el-table-column label="序号" align="center" width="55" type="index" />
-        <el-table-column label="材料名称" align="center" prop="materialsName" />
-        <el-table-column label="是否必传" align="center" prop="isMust">
-          <template #default="scope">
-            <el-tag :type="scope.row.isMust == 0 ? 'primary' : 'danger'">
-              <dict-tag :options="is_must" :value="scope.row.isMust" />
-            </el-tag>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          label="要求"
-          align="center"
-          prop="remark"
-        ></el-table-column>
-        <el-table-column label="材料列表" align="center" width="500">
-          <template #default="scope">
-            <ViewFileUpload
-              :isDisabled="isDisabled"
-              v-model="scope.row.fileNames"
-            ></ViewFileUpload>
-          </template>
-        </el-table-column>
-
-        <el-table-column v-if="!isDisabled" label="操作" align="center">
-          <template #default="scope">
-            <ViewFileUpload :isView="false" v-model="scope.row.fileNames">
-              <el-button type="text" :icon="Position"> 上传 </el-button>
-            </ViewFileUpload>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div style="display: flex; justify-content: center" v-if="!isDisabled">
-        <el-button
-          style="width: 100px; height: 40px; font-size: 16px; margin-top: 20px"
-          type="primary"
-          @click="onSubmit"
-          >提交</el-button
-        >
-      </div>
+    <div style="display: flex; justify-content: center" v-if="!isDisabled">
+      <el-button
+        style="width: 100px; height: 40px; font-size: 16px"
+        :loading="draftBoxLoading"
+        @click="saveDraftBox"
+        type="success"
+        >保存草稿</el-button
+      >
+      <el-button
+        style="width: 100px; height: 40px; font-size: 16px"
+        :loading="personFormLoading"
+        @click="onsubmit(personFormRef)"
+        type="primary"
+        >下一步</el-button
+      >
     </div>
   </div>
 </template>
@@ -1036,6 +1139,7 @@ const personDataFormRules = {
     },
   ],
 };
+
 const fileList = ref([]);
 const handleUploadSuccess = (file) => {
   personDataForm.photoPath = file.fileNames;

src/components/FileUpload/index.vue

@@ -223,11 +223,12 @@ function listToString(list, separator) {
 </script>
 
 <style scoped lang="scss">
+
 .upload-file-uploader {
   margin-bottom: 5px;
 }
 .upload-file-list .el-upload-list__item {
-  border: 1px solid #e4e7ed;
+  // border: 1px solid #e4e7ed;
   line-height: 2;
   margin-bottom: 10px;
   position: relative;

src/views/todoList/editPassed/index.vue

@@ -8,11 +8,10 @@
       ref="queryRef"
       :inline="true"
       v-show="showSearch"
-      label-width="100px"
     >
-      <el-form-item label="申请编号" prop="cardNumber">
+      <el-form-item label="申请编号" prop="sehnqing_number">
         <el-input
-          v-model="queryParams.cardNumber"
+          v-model="queryParams.sehnqing_number"
           placeholder="请输入卡片编号"
           clearable
           @keyup.enter="handleQuery"
@@ -27,6 +26,21 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="类型" prop="chineseName">
+        <el-select
+          v-model="queryParams.cardType"
+          placeholder="请选择类型"
+          clearable
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="dict in card_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery"
@@ -48,19 +62,19 @@
       </el-table-column>
       <el-table-column label="类型" align="center" prop="cardType">
         <template #default="scope">
-          <dict-tag :options="card_type" :value="scope.row.cardType" />
+          <dict-tag :options="card_type" :value="scope.row.card_type" />
         </template>
       </el-table-column>
       <el-table-column
         label="申请人"
         align="center"
-        prop="chineseName"
+        prop="chinese_name"
       ></el-table-column>
 
       <el-table-column
         label="申请编号"
         align="center"
-        prop="sehnqingNumber"
+        prop="sehnqing_number"
       ></el-table-column>
       <el-table-column label="事项名称" align="center" width="300">
         <template #default="scope">
@@ -77,18 +91,14 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        label="申请时间"
-        align="center"
-        prop="createTime"
-      ></el-table-column>
+      <el-table-column label="申请时间" align="center" prop="create_time">
+        <template #default="scope">
+          {{ parseTime(scope.row.create_time) }}
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="操作">
         <template #default="scope">
-          <el-button
-            size="small"
-            type="text"
-            icon="View"
-            @click="handleEdit(scope.row)"
+          <el-button type="text" icon="View" @click="handleEdit(scope.row)"
             >详细</el-button
           ></template
         >
@@ -113,26 +123,25 @@
       "
     >
       <div v-if="editDia">
-        <div class="cardTitle">
+        <div class="cardTitle" style="margin-bottom: 20px">
           燕赵英才卡（{{ activeForm.FlowName }}）申请表
         </div>
-        <div class="description">
+        <!-- <div class="description">
           <el-form :inline="true">
-            <!-- <el-form-item label="填报：">
-              <span>工作单位</span>
-            </el-form-item> -->
+           
             <el-form-item label="编号：">
               <span>{{ activeForm.sehnqingNumber }}</span>
             </el-form-item>
           </el-form>
-        </div>
+        </div> -->
       </div>
 
-      <el-tabs type="border-card">
+      <el-tabs>
         <el-tab-pane label="基本信息">
-          <div style="height: 580px; overflow-y: auto; margin-top: -40px">
+          <div style="height: 650px; overflow-y: auto">
             <AmatterClass
-              v-model:materialCalssId="rclkApplicationFormId"
+              :isDisabled="true"
+              :materialCalssId="rclkApplicationFormId"
               :isTableVisilite="false"
               :isReviewed="true"
             ></AmatterClass>
@@ -145,10 +154,13 @@
             v-model:materialCalssId="rclkApplicationFormId"
           ></materialTable>
         </el-tab-pane>
+        <el-tab-pane label="流转记录">
+         
+        </el-tab-pane>
       </el-tabs>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="editDia = false">取消</el-button>
+          <el-button type="info" @click="editDia = false">关闭</el-button>
         </div>
       </template>
     </el-dialog>

src/views/todoList/notPassed/index.vue

@@ -7,7 +7,6 @@
       ref="queryRef"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="类型" prop="cardType">
         <el-select

src/views/todoList/corrections/index.vue

@@ -9,7 +9,6 @@
       ref="queryRef"
       :inline="true"
       v-show="showSearch"
-      label-width="100px"
     >
       <el-form-item label="申请编号" prop="cardNumber">
         <el-input

src/views/todoList/index.vue

@@ -8,7 +8,6 @@
       ref="queryRef"
       :inline="true"
       v-show="showSearch"
-      label-width="100px"
     >
       <el-form-item label="申请编号" prop="cardNumber">
         <el-input
@@ -28,6 +27,21 @@
         />
       </el-form-item>
 
+      <el-form-item label="类型" prop="cardType">
+        <el-select
+          v-model="queryParams.cardType"
+          placeholder="请选择类型"
+          clearable
+        >
+          <el-option
+            v-for="dict in card_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery"
           >搜索</el-button
@@ -84,11 +98,7 @@
       ></el-table-column>
       <el-table-column align="center" label="操作">
         <template #default="scope">
-          <el-button
-            size="small"
-            type="text"
-            icon="Edit"
-            @click="handleEdit(scope.row)"
+          <el-button type="text" icon="Edit" @click="handleEdit(scope.row)"
             >审批</el-button
           ></template
         >
@@ -116,16 +126,13 @@
         <div class="cardTitle">
           燕赵英才卡（{{ activeForm.FlowName }}）申请表
         </div>
-        <div class="description">
+        <!-- <div class="description">
           <el-form :inline="true">
-            <!-- <el-form-item label="填报：">
-              <span>工作单位</span>
-            </el-form-item> -->
             <el-form-item label="编号：">
               <span>{{ activeForm.sehnqingNumber }}</span>
             </el-form-item>
           </el-form>
-        </div>
+        </div> -->
       </div>
 
       <el-form
@@ -157,11 +164,12 @@
           />
         </el-form-item>
       </el-form>
-      <el-tabs type="border-card">
+      <el-tabs>
         <el-tab-pane label="基本信息">
-          <div style="height: 580px; overflow-y: auto; margin-top: -40px">
+          <div style="height: 650px; overflow-y: auto">
             <AmatterClass
-              v-model:materialCalssId="rclkApplicationFormId"
+              :isDisabled="true"
+              :materialCalssId="rclkApplicationFormId"
               :isTableVisilite="false"
               :isReviewed="true"
             ></AmatterClass>
@@ -177,17 +185,11 @@
       </el-tabs>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="editDia = false">取消</el-button>
-          <el-button
-            v-if="!isReturn"
-            type="primary"
-            @click="handleSaveEdit(editFormRef)"
-          >
-            确 定
-          </el-button>
-          <el-button v-else type="primary" @click="returnDia = true">
-            退 回
+          <el-button type="info" @click="editDia = false">关 闭</el-button>
+          <el-button type="primary" @click="handleSaveEdit(editFormRef)">
+            通 过
           </el-button>
+          <el-button type="danger" @click="handleReject"> 退 回 </el-button>
         </div>
       </template>
     </el-dialog>
@@ -235,8 +237,8 @@ import {
   bysp,
   getNextNode,
 } from "@/api/talentManagement/todoList";
-import { ElMessage } from "element-plus";
-import { computed, toValue } from "vue";
+import { ElMessage,ElMessageBox } from "element-plus";
+import { computed, nextTick, toValue } from "vue";
 import { useRouter } from "vue-router";
 
 const router = useRouter();
@@ -335,7 +337,6 @@ const handleEdit = (row) => {
   editDia.value = true;
   activeItem.value = row;
   FK_NODE.value = row.FK_Node;
-  console.log(FK_NODE.value);
 
   getNextNode({ workid: row.WorkID, flowNo: "001" }).then((res) => {
     editForm.value.NodeID = res[0].NodeID;
@@ -348,50 +349,62 @@ const handleEdit = (row) => {
 
 //提交受理结果
 const handleSaveEdit = (formRef) => {
-  formRef.validate((vaild) => {
-    if (vaild) {
-      if (toValue(editState) == 0) {
-        sendFlowToUsers({
-          rclkId: activeItem.value.rclkApplicationFormId,
-          workid: activeItem.value.WorkID,
-          reviewlMsg: editForm.value.reviewlMsg,
-          optionName: editForm.value.Name,
-          toNodeId: editForm.value.NodeID,
-        }).then((res) => {
-          editDia.value = false;
-          ElMessage({
-            type: "success",
-            message: "提交成功",
-          });
-          getList();
-        });
-      } else if (toValue(editState) == 1) {
-        returnBcakRclk({
-          id: activeItem.value.rclkApplicationFormId,
-          returnMsg: editForm.value.reviewlMsg,
-        }).then((res) => {
-          editDia.value = false;
-          ElMessage({
-            type: "success",
-            message: "提交成功",
-          });
-          getList();
-        });
-      } else if (toValue(editState) == 2) {
-        bysp({
-          id: activeItem.value.rclkApplicationFormId,
-          msg: editForm.value.reviewlMsg,
-        }).then((res) => {
-          editDia.value = false;
-          ElMessage({
-            type: "success",
-            message: "提交成功",
-          });
-          getList();
-        });
-      }
-    }
-  });
+  ElMessageBox({
+    title: "提示",
+    type: "warning",
+    message: "确定提交受理结果吗？",
+    showCancelButton: true,
+    confirmButtonText: "确 定",
+    cancelButtonText: "关 闭",
+  }).then(() => {
+
+    // formRef.validate((vaild) => {
+    //   if (vaild) {
+    //     if (toValue(editState) == 0) {
+    //       sendFlowToUsers({
+    //         rclkId: activeItem.value.rclkApplicationFormId,
+    //         workid: activeItem.value.WorkID,
+    //         reviewlMsg: editForm.value.reviewlMsg,
+    //         optionName: editForm.value.Name,
+    //         toNodeId: editForm.value.NodeID,
+    //       }).then((res) => {
+    //         editDia.value = false;
+    //         ElMessage({
+    //           type: "success",
+    //           message: "提交成功",
+    //         });
+    //         getList();
+    //       });
+    //     } else if (toValue(editState) == 1) {
+    //       returnBcakRclk({
+    //         id: activeItem.value.rclkApplicationFormId,
+    //         returnMsg: editForm.value.reviewlMsg,
+    //       }).then((res) => {
+    //         editDia.value = false;
+    //         ElMessage({
+    //           type: "success",
+    //           message: "提交成功",
+    //         });
+    //         getList();
+    //       });
+    //     } else if (toValue(editState) == 2) {
+    //       bysp({
+    //         id: activeItem.value.rclkApplicationFormId,
+    //         msg: editForm.value.reviewlMsg,
+    //       }).then((res) => {
+    //         editDia.value = false;
+    //         ElMessage({
+    //           type: "success",
+    //           message: "提交成功",
+    //         });
+    //         getList();
+    //       });
+    //     }
+    //   }
+    // });
+ 
+ 
+ });
 };
 // 取消按钮
 function cancel() {
@@ -399,6 +412,14 @@ function cancel() {
   reset();
 }
 
+//退回
+const handleReject = () => {
+  nextTick(() => {
+    returnFormRef.value.resetFields();
+  });
+  returnDia.value = true;
+};
+
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
@@ -449,7 +470,6 @@ function handleDelete(row) {
 
 const isReturn = computed(() => {
   const NODEID = FK_NODE.value;
-
   return NODEID == "102" || NODEID == "103";
 });
 getList();

src/views/login.vue

@@ -91,8 +91,8 @@ const router = useRouter();
 const { proxy } = getCurrentInstance();
 
 const loginForm = ref({
-  username: "admin",
-  password: "admin123",
+  username: "rcfwzx001",
+  password: "123456",
   rememberMe: false,
   code: "",
   uuid: "",

src/views/talentManagement/categoryA/index.vue

@@ -7,7 +7,6 @@
       ref="queryRef"
       :inline="true"
       v-show="showSearch"
-      label-width="100px"
     >
       <el-form-item label="卡号" prop="cardNumber">
         <el-input

src/views/talentManagement/categoryB/index.vue

@@ -7,7 +7,6 @@
       ref="queryRef"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="卡片编号" prop="cardNumber">
         <el-input

src/views/talentManagement/register/index.vue

@@ -7,7 +7,6 @@
       ref="queryRef"
       :inline="true"
       v-show="showSearch"
-      label-width="120px"
     >
       <el-form-item label=" 用户名称" prop="userName">
         <el-input

src/views/talentManagement/writeOff/index.vue

@@ -8,7 +8,6 @@
       ref="queryRef"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="卡号" prop="cardNumber">
         <el-input

vite.config.js

@@ -33,7 +33,7 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         "/dev-api": {
-          target: "http://192.168.1.50:8088",
+          target: "http://192.168.1.10:8088",
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
         },