信息配置模块修改

src/api/infoConfig/api.js

@@ -62,6 +62,10 @@ const getSecurityInfoConfigurationHistory = (param) => {
 const uploadImage = (param) => {
     return postFile('/information/upload_pictures', param)
 }
+// 上传图片
+const delPerson = (param) => {
+    return del('/information/del_staff', param)
+}
 
 
 
@@ -79,4 +83,5 @@ export default {
     addSecurityInfoConfiguration,
     getSecurityInfoConfigurationHistory,
     uploadImage,
+    delPerson,
 }

src/views/systemManagement/infoConfiguration/dialog/createPeople.vue

@@ -31,13 +31,13 @@
         <el-form-item label="职责范围：">
           <el-input
             placeholder="请输入内容"
-            v-model="form.responsibilities"
+            v-model="form.responsibility_range"
           >
           </el-input>
         </el-form-item>
         <el-form-item label="人员名单：">
           <el-select
-            v-model="form.people"
+            v-model="form.staff_list"
             multiple
             placeholder="请选择"
           >
@@ -52,13 +52,13 @@
         </el-form-item>
         <el-form-item label="值班日期：">
           <el-date-picker
-            v-model="form.start"
+            v-model="form.duty_time.start_time"
             type="datetime"
             placeholder="选择日期时间"
           >
           </el-date-picker> 至
           <el-date-picker
-            v-model="form.stop"
+            v-model="form.duty_time.stop_time"
             type="datetime"
             placeholder="选择日期时间"
           >
@@ -72,7 +72,7 @@
             type="textarea"
             :rows="2"
             placeholder="请输入内容"
-            v-model="form.beizhu"
+            v-model="form.remark"
           >
           </el-input>
         </el-form-item>
@@ -96,17 +96,25 @@
 <script>
 import api from "@/api/infoConfig/api";
 export default {
+  props: {
+    editData: {
+      type: Object,
+    },
+  },
   data() {
     return {
       value: "",
       dialogVisible: false,
       form: {
-        personnelCategoryIndex: "",
-        responsibilities: "",
-        people: [],
-        beizhu: "",
-        start: "",
-        stop: "",
+        name: "",
+        personnel_type: "",
+        responsibility_range: "",
+        staff_list: [],
+        duty_time: {
+          start_time: "",
+          stop_time: "",
+        },
+        remark: "",
       },
 
       personnelCategory: [
@@ -148,8 +156,10 @@ export default {
         customClass: "systemConfigLoading",
       });
 
+      debugger;
+      return;
       api
-        .addDeviceToType(this.form)
+        .updateSecurityInfoConfiguration(this.form)
         .then((result) => {
           if (result.data.code == 0) {
             this.update();

src/views/systemManagement/infoConfiguration/securitystaffInfo.vue

@@ -52,7 +52,7 @@
         >
         </el-table-column>
         <el-table-column
-          prop="territory"
+          prop="responsibility_range"
           label="职责范围"
         >
         </el-table-column>
@@ -65,10 +65,13 @@
             ></el-image>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="status"
-          label="状态"
-        >
+        <el-table-column label="状态">
+          <template slot-scope="scope">
+            <span v-if="scope.row.status == 1">正常</span>
+            <span v-if="scope.row.status == 2">离职</span>
+            <span v-if="scope.row.status == 3">暂时冻结</span>
+          </template>
+          x
         </el-table-column>
         <el-table-column
           label="值班日期"
@@ -84,8 +87,8 @@
               type="text"
               size="small"
             >编辑</el-button> -->
-            <span v-if="scope.row.date">
-              {{$dayjs(scope.row.date.start).format("YYYY-MM-DD HH:mm:ss").replace("-","年").replace("-","月").replace(" ","日 ")}} 至 {{$dayjs(scope.row.date.stop).format("YYYY-MM-DD HH:mm:ss").replace("-","年").replace("-","月").replace(" ","日 ")}}
+            <span v-if="scope.row.duty_time">
+              {{$dayjs(scope.row.duty_time.start_time).format("YYYY-MM-DD HH:mm:ss").replace("-","年").replace("-","月").replace(" ","日 ")}} 至 {{$dayjs(scope.row.duty_time.end_time).format("YYYY-MM-DD HH:mm:ss").replace("-","年").replace("-","月").replace(" ","日 ")}}
             </span>
 
           </template>
@@ -115,11 +118,16 @@
     <div class="footer">
       <page :paginationData="paginationData"></page>
     </div>
-    <createPeople ref="createPeople"></createPeople>
+    <createPeople
+      ref="createPeople"
+      v-bind="{
+        
+      }"
+    ></createPeople>
     <createUpdatePeople
       ref="createUpdatePeople"
       v-bind="{
-        beforeForm:beforeForm,
+        editData:editData,
         update:getListAfterUpdate
       }"
     ></createUpdatePeople>
@@ -153,7 +161,6 @@ export default {
     historyPeople,
   },
   data() {
-    let that = this;
     return {
       // 正常 已离职 暂时冻结
       currentPageSize: 10,
@@ -171,8 +178,8 @@ export default {
           that.handleSizeChange(val);
         },
       },
-      beforeForm: null,
       tableData: [],
+      editData: null,
     };
   },
   mounted() {
@@ -186,7 +193,7 @@ export default {
       this.$refs.createPeople.dialogVisible = true;
     },
     updatePeo(data) {
-      console.log(data);
+      this.editData = data;
       this.$refs.createUpdatePeople.dialogVisible = true;
     },
     deletePeo(data) {
@@ -204,8 +211,9 @@ export default {
             customClass: "systemConfigLoading",
           });
           api
-            .delSecurityInfoConfiguration({
-              id: data.id,
+            .delPerson({
+              id: this.itemInfo.data.id,
+              staff:  data.id,
             })
             .then((result) => {
               loading.close();
@@ -292,14 +300,17 @@ export default {
               // "company_id": null,
               // "department": null,
               // "dept_id": null,
-              // "id": 1,
-              // "name": "",
+              // "duty_time": "{'start_time': '2023-1-10 20:00:00', end_time: '2023-1-20 20:00:00'}",
+              // "id": 2,
+              // "name": "\u5f20\u707f",
               // "phone": "010-68799999-6688",
-              // "photo": "/images/0402.png",
-              // "register_time": "2023-04-03 10:30:34",
+              // "photo": "/images/0399.png",
+              // "register_time": "2023-03-08 13:45:34",
+              // "responsibility_range": "\u5b89\u9632\u4eba\u5458",
               // "scope": null,
+              // "status": "1",
               // "type": 1,
-              // "work_number": "0402"
+              // "work_number": "0399"
               let tableData = result.data.data.staff_list;
               this.tableData = tableData.map((item) => {
                 // item.photo = "/api" + item.photo;