pref:修改添加工作人员

base-manager-ui/admin/src/pages/basicset/addmatter/components/pursuant.vue

@@ -27,6 +27,10 @@
         <template slot="num" slot-scope="text, record, index">
           {{ (current - 1) * size + index + 1 }}
         </template>
+        <!-- 法规类型 -->
+        <template slot="policyType" slot-scope="text">
+          {{ filterType(text.policyType) }}
+        </template>
         <!-- 查看详情 -->
         <template slot="more" slot-scope="text">
           <a class="look-more" @click="lookMore(text)">查看详情</a>
@@ -75,7 +79,7 @@ const columns = [
   },
   {
     title: "法规类型",
-    dataIndex: "policyType",
+    scopedSlots: { customRender: "policyType" },
   },
   {
     title: "条例",
@@ -173,15 +177,39 @@ export default {
     },
 
     // 删除
-    async handleDel(val) {
-      let res = await delMattersetbase({ id: val });
-      let { code, msg } = res.data;
-      if (code === 1) {
-        this.$message.success(msg);
-        this.getMattersetbaseData();
-      } else {
-        this.$message.error(msg);
-      }
+    handleDel(id) {
+      let _this = this;
+      this.$confirm({
+        title: "系统提示",
+        content: "删除不可恢复，确定要删除吗？",
+        okText: "确定",
+        okType: "danger",
+        cancelText: "取消",
+        centered: true,
+        icon: "exclamation-circle",
+        maskClosable: true,
+        async onOk() {
+          let res = await delMattersetbase({ id });
+          let { code, msg } = res.data;
+          if (code === 1) {
+            _this.$message.success(msg);
+            _this.getMattersetbaseData();
+          }
+        },
+        onCancel() {
+          console.log("Cancel");
+        },
+      });
+    },
+    // 过滤法规类型
+    filterType(key) {
+      let val = "--";
+      Object.keys(this.dict.policyType).forEach((keys) => {
+        if (key == keys) {
+          val = this.dict.policyType[keys];
+        }
+      });
+      return val;
     },
   },
 };

base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue

@@ -38,6 +38,23 @@
         <a-col :span="12">
           <a-form-model-item label="所属部门" prop="deptId">
             <a-select
+              showSearch
+              v-model="form.deptId"
+              optionFilterProp="label"
+              placeholder="请选择部门"
+              @change="handleDeptSelect"
+              allowClear
+            >
+              <a-select-option
+                v-for="v in diptData"
+                :key="v.id"
+                :value="v.id"
+                :label="v.name"
+              >
+                {{ v.name }}</a-select-option
+              >
+            </a-select>
+            <!-- <a-select
               v-model="form.deptId"
               @change="handleDeptSelect"
               placeholder="请选择部门"
@@ -48,11 +65,11 @@
                 :value="v.id"
                 >{{ v.name }}</a-select-option
               >
-            </a-select>
+            </a-select> -->
           </a-form-model-item>
         </a-col>
         <a-col :span="12">
-          <a-form-model-item label="星级">
+          <a-form-model-item label="星级" prop="starlevel">
             <a-select v-model="form.starlevel" placeholder="请选择星级">
               <a-select-option :value="5">5星</a-select-option>
               <a-select-option :value="4">4星</a-select-option>
@@ -93,7 +110,7 @@
       </a-row>
       <a-row>
         <a-col :span="12">
-          <a-form-model-item label="政治面貌">
+          <a-form-model-item label="政治面貌" prop="politicalstatus">
             <a-select
               allowClear
               v-model="form.politicalstatus"
@@ -109,7 +126,7 @@
           </a-form-model-item>
         </a-col>
         <a-col :span="12">
-          <a-form-model-item label="称号">
+          <a-form-model-item label="称号" prop="dangyuan">
             <a-select
               allowClear
               v-model="form.dangyuan"
@@ -158,11 +175,12 @@
             :label-col="{ span: 3 }"
             :wrapper-col="{ span: 19 }"
             label="个人简介"
+            prop="summary"
           >
-            <a-input
-              v-model="form.summary"
+            <a-textarea
               placeholder="请输入个人简介"
-              type="textarea"
+              allow-clear
+              v-model="form.summary"
             />
           </a-form-model-item>
         </a-col>
@@ -173,6 +191,7 @@
             :label-col="{ span: 4 }"
             :wrapper-col="{ span: 19 }"
             label="个人照片"
+            prop="photoPath"
           >
             <div class="person_image">
               <a-upload
@@ -245,8 +264,13 @@
             :label-col="{ span: 3 }"
             :wrapper-col="{ span: 19 }"
             label="办理事项"
+            prop="business"
           >
-            <a-input v-model="form.business" type="textarea" />
+            <a-textarea
+              placeholder="请输入办理事项"
+              allow-clear
+              v-model="form.business"
+            />
           </a-form-model-item>
         </a-col>
       </a-row>
@@ -256,8 +280,13 @@
             :label-col="{ span: 3 }"
             :wrapper-col="{ span: 19 }"
             label="岗位职责"
+            prop="duty"
           >
-            <a-input v-model="form.duty" type="textarea" />
+            <a-textarea
+              placeholder="请输入岗位职责"
+              allow-clear
+              v-model="form.duty"
+            />
           </a-form-model-item>
         </a-col>
       </a-row>
@@ -267,8 +296,13 @@
             :label-col="{ span: 3 }"
             :wrapper-col="{ span: 19 }"
             label="服务承诺"
+            prop="promise"
           >
-            <a-input v-model="form.promise" type="textarea" />
+            <a-textarea
+              placeholder="请输入服务承诺"
+              allow-clear
+              v-model="form.promise"
+            />
           </a-form-model-item>
         </a-col>
       </a-row>
@@ -435,10 +469,8 @@ export default {
           let { code, msg } = res.data;
           if (code === 1) {
             this.$message.success(msg);
-            this.$parent.getWorkmanData();
+            this.$emit("editSuccess");
             this.handleClose();
-          } else {
-            this.$message.error(msg);
           }
         }
       });

base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue

@@ -4,8 +4,7 @@
     @cancel="handleClose"
     title="新增工作人员"
     ok-text="确认"
-    cancel-text="取消"
-    @ok="hideModal"
+    cancel-text="重置"
     width="820px"
     :maskClosable="false"
   >
@@ -38,6 +37,24 @@
         <a-col :span="12">
           <a-form-model-item label="所属部门" prop="deptId">
             <a-select
+              showSearch
+              v-model="form.deptId"
+              optionFilterProp="label"
+              placeholder="请选择部门"
+              @change="handleDeptSelect"
+              allowClear
+            >
+              <a-select-option
+                v-for="v in diptData"
+                :key="v.id"
+                :value="v.id"
+                :label="v.name"
+              >
+                {{ v.name }}</a-select-option
+              >
+            </a-select>
+
+            <!-- <a-select
               v-model="form.deptId"
               @change="handleDeptSelect"
               allowClear
@@ -49,11 +66,11 @@
                 :value="v.id"
                 >{{ v.name }}</a-select-option
               >
-            </a-select>
+            </a-select> -->
           </a-form-model-item>
         </a-col>
         <a-col :span="12">
-          <a-form-model-item label="星级">
+          <a-form-model-item label="星级" prop="starlevel">
             <a-select
               allowClear
               v-model="form.starlevel"
@@ -98,7 +115,7 @@
       </a-row>
       <a-row>
         <a-col :span="12">
-          <a-form-model-item label="政治面貌">
+          <a-form-model-item label="政治面貌" prop="politicalstatus">
             <a-select
               allowClear
               v-model="form.politicalstatus"
@@ -114,7 +131,7 @@
           </a-form-model-item>
         </a-col>
         <a-col :span="12">
-          <a-form-model-item label="称号">
+          <a-form-model-item label="称号" prop="dangyuan">
             <a-select
               allowClear
               v-model="form.dangyuan"
@@ -163,11 +180,12 @@
             :label-col="{ span: 3 }"
             :wrapper-col="{ span: 19 }"
             label="个人简介"
+            prop="summary"
           >
-            <a-input
-              v-model="form.summary"
+            <a-textarea
               placeholder="请输入个人简介"
-              type="textarea"
+              allow-clear
+              v-model="form.summary"
             />
           </a-form-model-item>
         </a-col>
@@ -178,6 +196,7 @@
             :label-col="{ span: 4 }"
             :wrapper-col="{ span: 19 }"
             label="个人照片"
+            prop="photoPath"
           >
             <div class="person_image">
               <a-upload
@@ -185,9 +204,11 @@
                 list-type="picture-card"
                 class="avatar-uploader"
                 :show-upload-list="false"
-                :customRequest="uploadImg"
                 :before-upload="beforeUpload"
+                :action="api + 'base/file/commonupload'"
                 :accept="accept"
+                @change="handleChange"
+                :remove="handleRemove"
               >
                 <img
                   v-if="form.photoPath"
@@ -293,11 +314,12 @@
             :label-col="{ span: 3 }"
             :wrapper-col="{ span: 19 }"
             label="办理事项"
+            prop="business"
           >
-            <a-input
-              v-model="form.business"
+            <a-textarea
               placeholder="请输入办理事项"
-              type="textarea"
+              allow-clear
+              v-model="form.business"
             />
           </a-form-model-item>
         </a-col>
@@ -308,11 +330,12 @@
             :label-col="{ span: 3 }"
             :wrapper-col="{ span: 19 }"
             label="岗位职责"
+            prop="duty"
           >
-            <a-input
-              v-model="form.duty"
+            <a-textarea
               placeholder="请输入岗位职责"
-              type="textarea"
+              allow-clear
+              v-model="form.duty"
             />
           </a-form-model-item>
         </a-col>
@@ -323,22 +346,28 @@
             :label-col="{ span: 3 }"
             :wrapper-col="{ span: 19 }"
             label="服务承诺"
+            prop="promise"
           >
-            <a-input
-              v-model="form.promise"
+            <a-textarea
               placeholder="请输入服务承诺"
-              type="textarea"
+              allow-clear
+              v-model="form.promise"
             />
           </a-form-model-item>
         </a-col>
       </a-row>
     </a-form-model>
+    <!-- 按钮 -->
+    <div slot="footer">
+      <a-button @click="handleReset">重置</a-button>
+      <a-button type="primary" @click="hideModal">确定</a-button>
+    </div>
   </a-modal>
 </template>
 
 <script>
 import { changeAccount, changePassWord } from "@/utils/validate";
-import { getWindowList, saveWorkman, uploadFile } from "@/services/dept";
+import { getWindowList, saveWorkman } from "@/services/dept";
 import { modelList } from "@/services/basicsetFun";
 import { changePhone, changeLandline } from "@/utils/validate";
 import local from "@/utils/local";
@@ -502,15 +531,16 @@ export default {
           let { code, msg } = res.data;
           if (code === 1) {
             this.$message.success(msg);
-            this.$parent.getWorkmanData();
+            this.$emit("addSuccess");
             this.handleClose();
-          } else {
-            this.$message.error(msg);
           }
         }
       });
     },
-
+    // 重置
+    handleReset() {
+      this.$refs.formData.resetFields();
+    },
     // 新增
     onAdd() {
       Object.assign(this.form, this.$options.data().form);
@@ -524,21 +554,29 @@ export default {
     },
     // 关闭对话框
     handleClose() {
-      this.Visible = false;
       this.$refs.formData.resetFields();
+      this.Visible = false;
     },
     // 照片上传
-    async uploadImg(info) {
+    handleChange({ file }) {
       this.loading = true;
-      const formData = new FormData();
-      formData.append("file", info.file);
-      let res = await uploadFile(formData);
-      let { code, url } = res.data;
-      if (code === 1) {
-        this.form.photoPath = url;
+      if (file.type == "done") {
+        this.form.photoPath = file.response.url;
         this.loading = false;
       }
     },
+    handleRemove() {},
+    // async uploadImg(info) {
+    //   this.loading = true;
+    //   const formData = new FormData();
+    //   formData.append("file", info.file);
+    //   let res = await uploadFile(formData);
+    //   let { code, url } = res.data;
+    //   if (code === 1) {
+    //     this.form.photoPath = url;
+    //     this.loading = false;
+    //   }
+    // },
     // 照片大小格式限制
     beforeUpload(file) {
       const isJpgOrPng =

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -265,6 +265,7 @@
         :visibleAll.sync="visibleAll"
         :designationDict="designationDict"
         :politicalDict="politicalDict"
+        @addSuccess="getWorkmanData"
       ></addpersonnel>
       <!-- 编辑工作人员 -->
       <EditPersonel
@@ -273,6 +274,7 @@
         :designationDict="designationDict"
         :politicalDict="politicalDict"
         :diptData="deptData"
+        @editSuccess="getWorkmanData"
       ></EditPersonel>
       <!-- 修改密码 -->
       <EditPwd ref="EditPwd" :visibleEditPwd.sync="visibleEditPwd"></EditPwd>
@@ -537,10 +539,6 @@ export default {
       this.size = size;
       this.getWorkmanData();
     },
-    // 导入
-    // handleUpload() {
-    //   this.importFile();
-    // },
 
     // 批量导入工作人员模板下载
     async handleDownload() {
@@ -558,46 +556,6 @@ export default {
       document.body.appendChild(link);
     },
 
-    //导入文件
-    // importFile() {
-    //   let that = this;
-    //   let input = document.createElement("input");
-    //   input.setAttribute("type", "file");
-    //   input.setAttribute(
-    //     "accept",
-    //     "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
-    //   );
-    //   input.style.display = "none";
-    //   input.addEventListener("change", () => {
-    //     if (input.files && input.files.length > 0) {
-    //       that.uploadFile(input.files[0]);
-    //     }
-    //   });
-    //   document.body.appendChild(input);
-    //   input.click();
-    //   document.body.removeChild(input);
-    // },
-
-    //上传文件
-    // async uploadFile(file) {
-    //   let formData = new FormData();
-    //   formData.append("file", file);
-    //   formData.append("siteId", this.siteId);
-    //   formData.append("deptId", this.deptSearch);
-    //   formData.append("windowId", this.windowSearch);
-    //   let config = {
-    //     headers: {
-    //       "Content-Type": "multipart/form-data",
-    //     },
-    //   };
-    //   let res = await importData(formData, config);
-    //   let { code, msg } = res.data;
-    //   if (code === 1) {
-    //     this.$message.success(msg);
-    //     this.page = 1;
-    //     this.getWorkmanData();
-    //   }
-    // },
     // 批量上传工作人员
     handleChange({ file }) {
       this.spinning = true;
@@ -613,32 +571,6 @@ export default {
       }
     },
     // 批量导入照片
-    // handleUploadImg() {
-    //   let input = document.createElement("input");
-    //   input.setAttribute("type", "file");
-    //   input.setAttribute("accept", "application/x-zip-compressed");
-    //   input.style.display = "none";
-    //   input.addEventListener("change", async () => {
-    //     if (input.files && input.files.length > 0) {
-    //       let file = input.files[0];
-    //       let formData = new FormData();
-    //       formData.append("file", file);
-    //       let res = await uploadFile(formData);
-    //       if (res.data.code == 1) {
-    //         let result = await uploadAllImg({
-    //           filePath: res.data.url,
-    //         });
-    //         if (result.data.code === 1) {
-    //           this.$message.success(result.data.msg);
-    //         }
-    //       }
-    //     }
-    //   });
-    //   document.body.appendChild(input);
-    //   input.click();
-    //   document.body.removeChild(input);
-    // },
-    // 批量导入照片
     async handleChangeImg({ file }) {
       this.spinning = true;
       if (file.status === "done") {