暂提

3 years ago · fcf0f0f946
2 changed files with 84 additions and 95 deletions
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@ -2,7 +2,7 @@
  <div class="div_main">
    <div class="div_search">
      <el-form :inline="true"
-               :model="formData"
+               :model="workLog"
               ref="ref_searchform"
               :label-width="'100px'">
        <div>
@ -26,9 +26,9 @@
                       placeholder="请选择"
                       clearable>
              <el-option v-for="item in serviceTypeList"
-                         :key="item.id"
+                         :key="item.serviceType"
                         :label="item.serviceTypeName"
-                         :value="item.id">
+                         :value="item.serviceType">
              </el-option>
            </el-select>
          </el-form-item>
@ -274,8 +274,12 @@ export default {
      serviceList: [],//服务list
      typeList: [],//分类list
      formData: {
-        name: '',
-        category: ''
+        gridId: '',
+        serviceType: '',
+        applicantName: '',
+        applicantAddress: '',
+        applicantMobile: '',
+        serviceContent: ''
      },
      tableData: [],

@ -293,7 +297,7 @@ export default {

      files: "",
      fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/icPublicService/import',
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/heart/workdiaryService/record/import',
      optionsG: [],
      optionsEditG: [],
      workLog: {
@ -316,15 +320,8 @@ export default {
    this.getServiceTypeList();
  },
  async mounted () {
-    //获取服务事项
-    await this.loadService()
-
-    //获取分类
-    await this.loadType()
-
    const { user } = this.$store.state
    this.agencyId = user.agencyId
-
    await this.loadTable()
  },

@ -354,8 +351,8 @@ export default {
              });
    },
    async getServiceTypeList () {
-      let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
-      // let url = '/heart/workdiaryService/serviceType/page'
+      // let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
+      let url = '/heart/workdiaryService/serviceType/page'
      let params = {
        pageNo: 1,
        pageSize: 10000
@ -385,7 +382,6 @@ export default {
        data: params,
      })
        .then((res) => {
-          // this.download(res.data, title + '.xls')
          if (res.headers["content-disposition"]) {
            let fileName = window.decodeURI(
              res.headers["content-disposition"].split(";")[1].split("=")[1]
@ -411,48 +407,11 @@ export default {
        });
    },

-    //获取服务事项下拉框
-    async loadService () {
-      const url = "/gov/org/coverage/dict-select-list/public_service"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service"
-      let params = {
-        // parentCategoryCode: '1010'
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.serviceList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    //获取分类
-    async loadType () {
-      const url = "/sys/dict/data/dictlist"
-
-      let params = {
-        dictType: 'party_unit_type'
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.typeList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
    async loadTable () {
      this.tableLoading = true

-      // const url = "/gov/org/icPublicService/list"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page"
+      const url = "/heart/workdiaryService/record/page"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page"
      let params = {
        pageSize: this.pageSize,
        pageNo: this.pageNo,
@ -513,7 +472,7 @@ export default {
      this.formTitle = '修改'
      this.formShow = true
      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.icPublicServiceId)
+        this.$refs.ref_form.initForm('edit', row)
      })
    },

@ -538,18 +497,15 @@ export default {
        })
        .catch(err => {
          if (err == "cancel") {
-
          }
-
        });
    },

    async deleteUnit (row) {
-      // const url = "/heart/workdiaryService/record/delete"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete"
-      let params = {
-        ids: [row.applicantId]
-      }
+      const url = "/heart/workdiaryService/record/delete"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete"
+      let params = [row.id]
+
      const { data, code, msg } = await requestPost(url, params)
      if (code === 0) {
        this.$message({
@ -564,9 +520,13 @@ export default {

    //重置搜索条件
    resetSearch () {
-      this.formData = {
-        name: '',
-        category: ''
+      this.workLog = {
+        gridId: '',
+        serviceType: '',
+        applicantName: '',
+        applicantAddress: '',
+        applicantMobile: '',
+        serviceContent: ''
      }
      this.pageSize = 10
      this.pageNo = 0
@ -577,8 +537,8 @@ export default {
    async handleExport () {
      let title = '工作日志'

-      // const url = "/heart/workdiaryService/record/export"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/export"
+      const url = "/heart/workdiaryService/record/export"
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/export"
      let params = {
        ...this.workLog
      }
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@ -16,6 +16,7 @@
          <el-select v-model="formData.gridId"
                     filterable
                     placeholder="请选择"
+                     @change="handleGridChange"
                     clearable>
            <el-option v-for="item in optionsG"
                       :key="item.value"
@ -34,23 +35,27 @@
                     placeholder="请选择"
                     clearable>
            <el-option v-for="item in serviceTypeList"
-                       :key="item.id"
+                       :key="item.serviceType"
                       :label="item.serviceTypeName"
-                       :value="item.id">
+                       :value="item.serviceType">
            </el-option>
          </el-select>
        </el-form-item>

        <el-form-item label="申请人"
-                      prop="applicantName"
                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入申请人"
-                    v-model="formData.applicantName">
-          </el-input>
+                      style="display: block"
+                      prop="applicantId">
+          <el-select v-model="formData.applicantId"
+                     filterable
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in demandUserList"
+                       :key="item.demandUserId"
+                       :label="item.label"
+                       :value="item.demandUserId">
+            </el-option>
+          </el-select>
        </el-form-item>

        <el-form-item label="住址"
@ -147,10 +152,13 @@ export default {
      applicantId: '',
      keyWords: '',
      formData: {
-        serviceType: '',
+        serviceType: 0,
+        serviceTypeName: '',
        gridId: '',
+        gridName: '',
        applicantAddress: '',
        applicantName: '',
+        applicantId: '',
        serviceContent: '',
        applicantMobile: '',
        principalName: '',
@ -160,6 +168,7 @@ export default {
      optionsG: [],
      serviceTypeList: [],
      publicServiceData: {},
+      demandUserList: []
    }
  },
  components: {},
@ -172,28 +181,25 @@ export default {

  methods: {

-    async initForm (type, applicantId) {
+    async initForm (type, row) {
      this.startLoading()
      this.$refs.ref_form.resetFields();

      //获取服务事项
      await this.getServiceTypeList()
+      this.getGridList(type)

      this.formType = type
-      if (applicantId) {
-        this.applicantId = applicantId
-        this.formData.applicantId = applicantId
-        // await this.loadFormData()
-      } else {
-
+      if (type === 'edit'){
+        this.formData = row
      }
      this.endLoading()
    },

    //获取服务事项下拉框
    async getServiceTypeList () {
-      // const url = "/heart/workdiaryService/serviceType/page"
-      let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
+      const url = "/heart/workdiaryService/serviceType/page"
+      // let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
      let params = {
        pageNo: 1,
        pageSize: 10000
@ -205,7 +211,27 @@ export default {
        this.$message.error(msg)
      }
    },
-
+    async getDemandUserList () {
+      const { user } = await this.$store.state;
+      const params = {
+        agencyId: user.agencyId,
+        gridId: this.formData.gridId,
+        name: "",
+      };
+      // addorupdate
+      await this.$http
+              .post("/epmetuser/icresiuser/demandusers", params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                } else {
+                  this.demandUserList = res.data;
+                }
+              })
+              .catch(() => {
+                return this.$message.error("网络错误");
+              });
+    },
    //加载组织
    async getGridList (type) {
      const { user } = await this.$store.state;
@ -222,7 +248,9 @@ export default {
        this.$message.error(msg)
      }
    },
-
+    handleGridChange (val) {
+      this.getDemandUserList();
+    },


    async handleComfirm () {
@ -242,10 +270,11 @@ export default {
    async addUnit () {
      let url = ''
      if (this.formType === 'add') {
-        // url = '/heart/workdiaryService/record/save'
-        url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/save'
+        url = '/heart/workdiaryService/record/save'
+        // url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/save'
      } else {
-        url = '/gov/org/icPublicService/edit'
+        url = '/heart/workdiaryService/record/update'
+        // url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/update'
      }
      const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
      if (code === 0) {
@ -270,7 +299,7 @@ export default {
    },
    resetData () {
      this.formData = {
-        serviceType: '',
+        serviceType: 0,
        gridId: '',
        applicantAddress: '',
        applicantName: '',
@ -309,7 +338,7 @@ export default {
        applicantAddress: [
          { required: true, message: '住址不能为空', trigger: 'blur' }
        ],
-        applicantName: [
+        applicantId: [
          { required: true, message: '申请人不能为空', trigger: 'blur' }
        ],
        serviceContent: [