修改花名册bug

yanzhu-ui-vue3/package.json

@@ -7,6 +7,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "vite",
+    "dev:prod": "vite --mode production",
     "build:prod": "vite build",
     "build:stage": "vite build --mode staging",
     "preview": "vite preview"

yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue

@@ -199,7 +199,7 @@
               </el-col>
               <el-col :span="8" class="fitem-no-width">
                 <el-form-item label="技术负责人电话" prop="techLeaderPhone">
-                  <el-input v-model="form.techLeaderPhone" maxlength="10" show-word-limit placeholder="请输入技术负责人电话" />
+                  <el-input v-model="form.techLeaderPhone" maxlength="11" show-word-limit placeholder="请输入技术负责人电话" />
                 </el-form-item>
               </el-col>
             </el-row>

yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue

@@ -3,12 +3,14 @@
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
 
       <el-form-item label="所属单位" prop="subDeptId">
-        <el-select v-model="queryParams.subDeptId" placeholder="请选择所属单位" @change="doSubDeptChange('query')" clearable style="width:150px;">
+        <el-select v-model="queryParams.subDeptId" placeholder="请选择所属单位" @change="doSubDeptChange('query')" clearable
+          style="width:150px;">
           <el-option v-for="(it) in data.subdepts" :key="it.id" :label="it.subDeptName" :value="it.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="班组" prop="subDeptName">
-        <el-select v-model="queryParams.subDeptGroup" placeholder="请选择班组" @change="doDeptGroupChange" clearable style="width:150px;">
+        <el-select v-model="queryParams.subDeptGroup" placeholder="请选择班组" @change="doDeptGroupChange" clearable
+          style="width:150px;">
           <el-option v-for="(it, idx) in data.queryDeptGroups" :key="idx" :label="it.groupName" :value="it.id" />
         </el-select>
       </el-form-item>
@@ -29,8 +31,6 @@
             v-for="dict in (queryParams.craftType ? pro_craft_post.filter(d => d.remark == queryParams.craftType) : [])"
             :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>
@@ -70,7 +70,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="头像" align="center">
         <template #default="scope">
-         <el-image :src="scope.row.user.userPicture" style="height:80px;" :preview-teleported="true" :preview-src-list="[scope.row.user.userPicture]"></el-image>
+          <el-image :src="scope.row.user.userPicture" style="height:80px;" :preview-teleported="true"
+            :preview-src-list="[scope.row.user.userPicture]"></el-image>
         </template>
       </el-table-column>
       <el-table-column label="姓名" align="center" prop="userName" />
@@ -132,7 +133,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所属单位" prop="subDeptId">
+            <el-form-item label="所属单位11" prop="subDeptId">
               <el-select v-model="form.subDeptId" placeholder="请选择所属单位" @change="doSubDeptChange()">
                 <el-option v-for="(it) in data.subdepts" :key="it.id" :label="it.subDeptName" :value="it.id" />
               </el-select>
@@ -154,8 +155,8 @@
           </el-col>
           <div style="width: 100%;">
             <el-form-item label="联系电话" prop="userPhone">
-            <el-input v-model="form.userPhone" disabled v-if="data.mode == 'edit'" placeholder="请输入联系电话" minlength="11"
+              <el-input v-model="form.userPhone" disabled v-if="data.mode == 'edit'" placeholder="请输入联系电话"
-              maxlength="11" style="width: 200px;" />
+                minlength="11" maxlength="11" style="width: 200px;" />
               <el-input v-model="form.userPhone" v-else placeholder="请输入联系电话" minlength="11" maxlength="11"
                 style="width: 200px;" />
               <el-button type="primary" v-if="data.mode != 'edit' && false" style="margin-left:10px;"
@@ -322,7 +323,7 @@ const data = reactive({
       { min: 11, max: 11, message: '请输入有效手机号码', trigger: 'blur' },
       { validator: validatePhone, trigger: 'blur' }],
     certificateCode: [{ required: true, trigger: ['blur', 'change'], message: "请输入证件号码" }],
-    craftPost: [{ required: true, trigger: ['blur', 'change'], message: "请输选择工种" }],
+    craftPost: [{ required: true, trigger: ['blur', 'change'], message: "请选择工种" }],
     identificationCard: [{ required: true, trigger: ['blur', 'change'], message: "请上传身份证信息" }],
     subDeptGroup: [{ required: true, trigger: ['blur', 'change'], message: "请选择班组" }],
   },
@@ -405,6 +406,8 @@ function tryToJson(str) {
 /** 查询分包单位工人列表 */
 function getList() {
   loading.value = true;
+  queryParams.value.comId = userStore.currentComId;
+  queryParams.value.projectId = userStore.currentPrjId;
   listProProjectInfoSubdeptsUsers(queryParams.value).then(response => {
 
     proProjectInfoSubdeptsUsersList.value = (response.rows || []).map(d => {
@@ -561,11 +564,16 @@ function loadSubDepts(cb) {
   listProProjectInfoSubdepts({ projectId: userStore.currentPrjId, pageNum: 1, pageSize: 100 }).then(d => {
     data.subdepts = d.rows || [];
     if (data.subdepts.length > 0) {
+      setTimeout(()=>{
         let sd = data.subdepts[0];
-      form.value.subDeptId = "" + sd.id;
+        form.value.subDeptId =  sd.id;
         doSubDeptChange();
-    }
         cb && cb();
+      },400);
+    }else{
+      cb && cb();
+    }
+    
   });
 }
 
@@ -575,7 +583,10 @@ function handleAdd() {
     proxy.$modal.msgWarning("请切换到项目数据！！！");
     return false;
   }
+  open.value = true;
+  title.value = "添加劳务人员信息";
   reset();
+  loadSubDepts(()=> {
     data.editData = null;
     data.mode = 'add';
     form.value.certificateType = "";
@@ -584,8 +595,7 @@ function handleAdd() {
     form.value.projectName = userStore.currentProName;
     form.value.nation = data.nationOpts[0];
     form.value.sex = data.sexOpts[0];      
-  open.value = true;
+  });
-  title.value = "添加劳务人员信息";
 }
 
 /** 修改按钮操作 */
@@ -594,6 +604,9 @@ function handleUpdate(row) {
   const _id = row.id || ids.value
   data.mode = 'edit'
   data.editData = row;
+  open.value = true;
+    title.value = "修改劳务人员信息";
+  loadSubDepts(()=>{
   getProProjectInfoSubdeptsUsers(_id).then(response => {
     let obj = JSON.parse(JSON.stringify(response.data));
     obj.info = tryToJson(obj.userInfos || "{}");
@@ -613,7 +626,6 @@ function handleUpdate(row) {
     obj.certificatePhoto2 = obj.info.certificatePhoto2;
     obj.faceImage = obj.userPicture;
     obj.educationalType = obj.degreeGrade
-    debugger
     form.value = obj;
     form.value.userId = obj.userId;
 
@@ -621,8 +633,7 @@ function handleUpdate(row) {
     form.value.projectName = row.projectName;
     //showEditUser(obj.user);
     data.phoneState = "edit";
-    open.value = true;
+    
-    title.value = "修改劳务人员信息";
     doImageUpload();
 
     //doDeptGroupChange();
@@ -631,6 +642,7 @@ function handleUpdate(row) {
       form.value.craftPost = response.data.craftPost;
     }, 400);
   });
+});
 }
 
 function showEditUser(user) {
@@ -742,9 +754,8 @@ function handleExport() {
     ...queryParams.value
   }, `proProjectInfoSubdeptsUsers_${new Date().getTime()}.xlsx`)
 }
-
-getList();
 loadSubDepts();
+getList();
 </script>
 <style lang="scss">
 .pro-project-info-subdepts-users-index {

yanzhu-ui-vue3/vite.config.js

@@ -29,10 +29,17 @@ export default defineConfig(({ mode, command }) => {
       host: true,
       open: true,
       proxy: {
+        "/prod-api": {
+        //target: "http://localhost:8080",
+        target: 'http://62.234.3.186',
+        changeOrigin: true,
+        pathRewrite: {
+          "^/prod-api": "/",
+        },
+      },
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
           target: 'http://localhost:8080',
-          //target: 'http://62.234.3.186/prod-api/',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },