Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml

@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, psu.sub_dept_name, psu.sub_dept_power_path, psu.user_id, psu.user_post, psu.sub_dept_group,
         psu.sub_dept_group_name, psu.user_name, psu.card_type, psu.card_code, psu.user_sex, psu.user_picture, psu.user_phone, psu.degree_grade, dic4.dict_label as degree_grade_name, psu.user_infos, psu.craft_type, dic1.dict_label as craft_type_name, psu.craft_post, dic2.dict_label as craft_post_name, psu.edu_status, psu.edu_file_path, psu.edu_date, psu.approve_status,
         psu.use_date, psu.use_status, psu.admit_guid, psu.qr_code, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time,
-        psu.remark,psu.face_guid
+        psu.remark,psu.face_guid,sd.dept_name com_name
         from pro_project_info_subdepts_users psu
         left join pro_project_info pi on pi.id = psu.project_id
         left join sys_dept sd on sd.dept_id = pi.com_id

yanzhu-ui-vue3/src/views/login.vue

@@ -165,10 +165,10 @@ getCookie();
     border-radius: 6px;
     background-image: url("../assets/images/loginbg2.png");
     background-size: 100% 100%;
-    width: 300px;
+    width: 360px;
     padding: 50px 25px 5px 25px;
     position: absolute;
-    height: 440px;
+    height: 480px;
     right: 10%;
     .el-form-item{
       position: relative;

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

@@ -107,7 +107,7 @@
       <template #footer>
         <div class="dialog-footer" style="text-align: center;">
           <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button @click="doCancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -132,7 +132,7 @@
     </el-table>
       <template #footer>
         <div class="dialog-footer" style="text-align: center;">
-          <el-button type="primary" @click="open=false">确 定</el-button>
+          <el-button type="primary" @click="data.openImport=false">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -204,19 +204,21 @@ const data = reactive({
   currentPrjId:'',
   types:greenCarbonData.types,
   delDatas:[],
+  delDataIds:[],
   importData:[],
   openImport:false,
 });
 
 const { queryParams, form, rules } = toRefs(data);
 /** 查询项目列表 */
-function getProjectList() {
+function getProjectList(cb) {
   findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
     data.projects = response.rows;
     if (userStore.currentPrjId) {
       queryParams.value.projectId = userStore.currentPrjId
       data.currentPrjId = userStore.currentPrjId;
     }
+    cb && cb();
   });
 }
 /** 查询碳因子管理列表 */
@@ -230,7 +232,7 @@ function getList() {
 }
 
 // 取消按钮
-function cancel() {
+function doCancel() {
   open.value = false;
   reset();
 }
@@ -272,6 +274,7 @@ function resetQuery() {
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.id);
   data.delDatas=selection.map(item=> getGreenCarbon(item.carbonFactorType).text +' - '+item.carbonName);
+  data.delDataIds=selection.map(item=> item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
@@ -324,8 +327,9 @@ function submitForm() {
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const _ids =row && row.id? getGreenCarbon(row.carbonFactorType).text +' - '+row.carbonName:data.delDatas.join(",");
-  proxy.$modal.confirm('是否确认删【' + _ids + '】的数据项？').then(function () {
+  const names =row && row.id? getGreenCarbon(row.carbonFactorType).text +' - '+row.carbonName:data.delDatas.join(",");
+  const _ids =row && row.id? row.id:data.delDataIds.join(",");
+  proxy.$modal.confirm('是否确认删【' + names + '】的数据项？').then(function () {
     return delGreenCarbonItem(_ids);
   }).then(() => {
     getList();
@@ -361,8 +365,10 @@ const handleFileSuccess = (response, file, fileList) => {
 };
 
 
+
+getProjectList(()=>{
   getList();
-getProjectList();
+});
 </script>
 <style type="scss">
 

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

@@ -396,6 +396,7 @@ function doImageUpload(type) {
           form.value.userName=form.value.userName||d.data.name||'';
           form.value.certificateCode=form.value.certificateCode||d.data.cardId||'';
           form.value.address=form.value.address||d.data.address||'';
+          from.value.nativePlace=form.value.native||d.data.native||'';
           let nation=d.data.nation||"";
           if(nation){
            let tmps= data.nationOpts.filter(it=>it.indexOf(nation)>=0);
@@ -416,6 +417,7 @@ function doImageUpload(type) {
         });
       }      
     }else if(type==2){
+      /*
       url=form.value.certificatePhoto2;
       if(url){
         url=location.origin+url;
@@ -423,7 +425,7 @@ function doImageUpload(type) {
         proxy.$http.get(`/system/tools/id/back?url=${url}`).then(d=>{
           form.value.nativePlace=form.value.nativePlace||d.data.issuing||'';
         });
-      } 
+      } */
     }
   }, 800);
 }