暂提

src/views/modules/communityService/worklog/workLog.vue

@@ -229,10 +229,10 @@
                top="5vh"
                class="dialog-h"
                @closed="editDiaClose">
-      <ggfw-form ref="ref_form"
+      <work-log-form ref="ref_form"
                  :typeList="typeList"
                  @dialogCancle="addFormCancle"
-                 @dialogOk="addFormOk"></ggfw-form>
+                 @dialogOk="addFormOk"></work-log-form>
     </el-dialog>
 
     <el-dialog :visible.sync="detailShow"
@@ -243,8 +243,8 @@
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
-      <ggfw-detail ref="ref_detail"
+      <work-log-detail ref="ref_detail"
-                   @diaClose="diaClose"></ggfw-detail>
+                   @diaClose="diaClose"></work-log-detail>
     </el-dialog>
 
   </div>
@@ -503,7 +503,7 @@ export default {
 
     handleAdd () {
       this.formTitle = '新增'
-      this.formShow = 'edit'
+      this.formShow = 'add'
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add', null)
       })

src/views/modules/communityService/worklog/workLogDetail.vue

@@ -10,7 +10,8 @@
         <el-form-item label="服务类型"
                       prop="serviceTypeName"
                       label-width="150px"
-                      style="display: block">
+                      style="display: block"
+                      class="input-width">
           <span>{{formData.serviceTypeName}}</span>
 
         </el-form-item>
@@ -24,8 +25,9 @@
         <el-form-item label="申请人"
                       prop="applicantName"
                       label-width="150px"
+                      class="input-width"
                       style="display: block">
-          <span>{{formData.areaCovered}}</span>
+          <span>{{formData.applicantName}}</span>
 
         </el-form-item>
         <el-form-item label="住址"
@@ -34,31 +36,31 @@
                       style="display: block">
           <span>{{formData.applicantAddress}}</span>
         </el-form-item>
-        <el-form-item label="服务内容："
+        <el-form-item label="服务内容"
-                      prop="principal"
+                      prop="serviceContent"
                       label-width="150px"
                       style="display: block">
-          <span>{{formData.applicantContent}}</span>
+          <span>{{formData.serviceContent}}</span>
         </el-form-item>
-        <el-form-item label="联系电话："
+        <el-form-item label="联系电话"
                       prop="mobile"
                       label-width="150px"
                       style="display: block">
           <span>{{formData.applicantMobile}}</span>
         </el-form-item>
-        <el-form-item label="负责人："
+        <el-form-item label="负责人"
                       style="display: block"
                       prop="address"
                       label-width="150px">
           <span>{{formData.principalName}}</span>
         </el-form-item>
-        <el-form-item label="服务时间："
+        <el-form-item label="服务时间"
                       style="display: block"
                       prop="address"
                       label-width="150px">
           <span>{{formData.serviceTime}}</span>
         </el-form-item>
-        <el-form-item label="备注："
+        <el-form-item label="备注"
                       style="display: block"
                       prop="address"
                       label-width="150px">

src/views/modules/communityService/worklog/workLogForm.vue

@@ -9,91 +9,105 @@
                :disabled="formType === 'detail'"
                class="form">
 
-        <el-form-item label="场所名称"
+        <el-form-item label="所属网格"
-                      prop="name"
                       label-width="150px"
-                      style="display: block">
+                      style="display: block"
-          <el-input class="item_width_1"
+                      prop="gridId">
-                    maxlength="50"
+          <el-select v-model="formData.gridId"
-                    show-word-limit
-                    placeholder="请输入场所名称"
-                    v-model="formData.name">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="场所类型"
-                      prop="category"
-                      label-width="150px"
-                      style="display: block">
-          <el-select class="item_width_1"
-                     v-model="formData.category"
-                     placeholder="请选择"
                      filterable
+                     placeholder="请选择"
                      clearable>
-            <el-option v-for="item in serviceList"
+            <el-option v-for="item in optionsG"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
             </el-option>
           </el-select>
+        </el-form-item>
 
+        <el-form-item label="服务类型"
+                      label-width="150px"
+                      style="display: block"
+                      prop="serviceType">
+          <el-select v-model="formData.serviceType"
+                     filterable
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in serviceTypeList"
+                       :key="item.id"
+                       :label="item.serviceTypeName"
+                       :value="item.id">
+            </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>
         </el-form-item>
 
-        <el-form-item label="占地面积"
+        <el-form-item label="住址"
                       style="display: block"
-                      prop="areaCovered"
+                      label-width="150px"
-                      label-width="150px">
+                      prop="applicantAddress">
-          <el-input-number class="item_width_4"
+          <el-input v-model="formData.applicantAddress"
-                           v-model="formData.areaCovered"
+                    class="item_width_1"
-                           :precision="2"
+                    placeholder="请输入住址"></el-input>
-                           :step="0.01"
-                           :min="0"
-                           :max="9600000"
-                           label="占地面积"></el-input-number>平方公里
         </el-form-item>
-        <el-form-item label="容纳人数"
+        <el-form-item label="服务内容"
                       style="display: block"
-                      prop="capacity"
+                      label-width="150px"
-                      label-width="150px">
+                      prop="serviceContent">
-          <el-input-number class="item_width_4"
+          <el-input v-model="formData.serviceContent"
-                           v-model="formData.capacity"
+                    class="item_width_1"
-                           :min="0"
+                    type="textarea"
-                           :max="9999"
+                    placeholder="请输入服务内容"></el-input>
-                           label="容纳人数"></el-input-number>
+        </el-form-item>
+
+        <el-form-item label="联系电话"
+                      style="display: block"
+                      label-width="150px"
+                      prop="applicantMobile">
+          <el-input v-model="formData.applicantMobile"
+                    class="item_width_1"
+                    placeholder="请输入联系电话"></el-input>
         </el-form-item>
 
         <el-form-item label="负责人"
                       style="display: block"
                       label-width="150px"
-                      prop="principal">
+                      prop="principalName">
-          <el-input v-model="formData.principal"
+          <el-input v-model="formData.principalName"
                     class="item_width_1"
-                    placeholder="请输入负责人姓名"></el-input>
+                    placeholder="请输入负责人"></el-input>
         </el-form-item>
-        <el-form-item label="联系电话"
+
+        <el-form-item label="服务时间"
                       style="display: block"
                       label-width="150px"
-                      prop="mobile">
+                      prop="serviceTime">
-          <el-input v-model="formData.mobile"
+          <el-input v-model="formData.serviceTime"
                     class="item_width_1"
-                    placeholder="请输入联系电话"></el-input>
+                    placeholder="请输入服务时间"></el-input>
         </el-form-item>
-        <el-form-item label="地址"
+
-                      prop="address"
+        <el-form-item label="备注"
+                      style="display: block"
                       label-width="150px"
-                      style="display: block">
+                      prop="remark">
-          <div class="item_width_1">
+          <el-input v-model="formData.remark"
-            <el-input style="width:420px"
+                    class="item_width_1"
-                      :placeholder="'请输入所在地址'"
+                    type="textarea"
-                      v-model="formData.address">
+                    placeholder="请输入备注"></el-input>
-            </el-input>
-            <el-button style="margin-left: 10px"
-                       type="default"
-                       size="small"
-                       @click="handleSearchMap">查询</el-button>
-            <div id="app"
-                 class="div_map"></div>
-          </div>
         </el-form-item>
+
       </el-form>
     </div>
 
@@ -127,93 +141,83 @@ export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
+      agencyId: '',
       btnDisable: false,
 
-      icPublicServiceId: '',
+      applicantId: '',
       keyWords: '',
       formData: {
-        name: '',//场所名称
+        serviceType: '',
-        category: '',
+        gridId: '',
-        areaCovered: '',//占地面积
+        applicantAddress: '',
-        capacity: '',//容纳人数
+        applicantName: '',
-        address: '', //详细地址
+        serviceContent: '',
-        longitude: 36.0722275, //经度
+        applicantMobile: '',
-        latitude: 120.38945519, //纬度
+        principalName: '',
-        principal: '',
+        serviceTime: '',
-        mobile: ''
+        remark: ''
       },
-      serviceList: [],//服务list
+      optionsG: [],
+      serviceTypeList: [],
       publicServiceData: {},
     }
   },
   components: {},
+  async created () {
+    this.getGridList('query')
+    this.getServiceTypeList()
+  },
   mounted () {
   },
 
   methods: {
 
-    async initForm (type, icPublicServiceId) {
+    async initForm (type, applicantId) {
       this.startLoading()
       this.$refs.ref_form.resetFields();
 
       //获取服务事项
-      await this.loadService()
+      await this.getServiceTypeList()
 
       this.formType = type
-      if (icPublicServiceId) {
+      if (applicantId) {
-        this.icPublicServiceId = icPublicServiceId
+        this.applicantId = applicantId
-        this.formData.icPublicServiceId = icPublicServiceId
+        this.formData.applicantId = applicantId
-        await this.loadFormData()
+        // await this.loadFormData()
       } else {
-        // map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
-        // this.setMarker(36.0722275, 120.38945519)
-      }
 
+      }
       this.endLoading()
-
     },
 
     //获取服务事项下拉框
-    async loadService () {
+    async getServiceTypeList () {
-      const url = "/gov/org/coverage/dict-select-list/public_service"
+      // const url = "/heart/workdiaryService/serviceType/page"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service"
+      let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
       let params = {
+        pageNo: 1,
+        pageSize: 10000
       }
-
       const { data, code, msg } = await requestPost(url, params)
-
       if (code === 0) {
-        this.serviceList = data
+        this.serviceTypeList = data.list
-
       } else {
         this.$message.error(msg)
       }
-
     },
 
     //加载组织
-    async loadFormData () {
+    async getGridList (type) {
-      const url = '/gov/org/icPublicService/detail'
+      const { user } = await this.$store.state;
+      const url = '/gov/org/customergrid/gridoption'
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail'
       let params = {
-        icPublicServiceId: this.icPublicServiceId
+        agencyId: user.agencyId,
+        purpose: type,
       }
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
-        console.log(data)
+        this.optionsG = data;
-        if (null != data) {
-          data: this.publicServiceData
-        }
-
-        this.formData = { ...data }
-        // let { latitude, longitude } = this.$store.state.user;
-        // const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
-        // const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
-        if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
-          map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
-          this.setMarker(this.formData.latitude, this.formData.longitude)
-        }
       } else {
         this.$message.error(msg)
       }
@@ -222,7 +226,6 @@ export default {
 
 
     async handleComfirm () {
-
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
@@ -234,15 +237,13 @@ export default {
         } else {
           this.addUnit()
         }
-
       })
-
-
     },
     async addUnit () {
       let url = ''
       if (this.formType === 'add') {
-        url = '/gov/org/icPublicService/add'
+        // url = '/heart/workdiaryService/record/save'
+        url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/save'
       } else {
         url = '/gov/org/icPublicService/edit'
       }
@@ -267,138 +268,17 @@ export default {
       this.$emit('dialogCancle')
 
     },
-
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      let { latitude, longitude } = this.$store.state.user;
-      console.log('lat' + latitude + ',lon' + longitude)
-      if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
-      }
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(latitude, longitude);
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app'), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
-
-      search = new window.TMap.service.Search({ pageSize: 10 })
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
-
-      // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      // this.handleMoveCenter()
-      this.convert()
-    },
-
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
-        {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
-        }
-      ])
-    },
-
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchRectangle({
-          keyword: this.formData.address,
-          bounds: map.getBounds()
-        })
-        .then((result) => {
-          let { data } = result
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng }
-            } = data[0]
-
-
-            map.setCenter(new TMap.LatLng(lat, lng))
-            this.setMarker(lat, lng)
-            this.formData.latitude = lat
-            this.formData.longitude = lng
-            this.convert()
-          } else {
-            this.$message.error('未检索到相关位置坐标')
-          }
-        })
-    },
-
-    handleMoveCenter () {
-      //修改地图中心点
-      const center = map.getCenter()
-      const lat = center.getLat()
-      const lng = center.getLng()
-      this.formData.latitude = lat
-      this.formData.longitude = lng
-      this.setMarker(lat, lng)
-      this.convert(lat, lng)
-    },
-
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
-      } else {
-        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
-      }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: 'main', // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          console.log(this.formData)
-          // this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
-          this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
-          // 显示搜索到的地址
-        });
-    },
-
-
     resetData () {
-      this.icPublicServiceId = ''
-      this.keyWords = ''
       this.formData = {
-        name: '',
+        serviceType: '',
-        category: '',
+        gridId: '',
-        areaCovered: '',
+        applicantAddress: '',
-        capacity: '',
+        applicantName: '',
-        address: '', //详细地址
+        serviceContent: '',
-        longitude: '', //经度
+        applicantMobile: '',
-        latitude: '' //纬度
+        principalName: '',
+        serviceTime: '',
+        remark: ''
       }
     },
     // 开启加载动画
@@ -420,22 +300,27 @@ export default {
   computed: {
     dataRule () {
       return {
-
+        gridId: [
-        name: [
+          { required: true, message: '所属网格不能为空', trigger: 'blur' },
-          { required: true, message: '场所名称不能为空', trigger: 'blur' },
+        ],
+        serviceType: [
+          { required: true, message: '服务类型不能为空', trigger: 'blur' }
+        ],
+        applicantAddress: [
+          { required: true, message: '住址不能为空', trigger: 'blur' }
         ],
-        category: [
+        applicantName: [
-          { required: true, message: '场所类别不能为空', trigger: 'blur' }
+          { required: true, message: '申请人不能为空', trigger: 'blur' }
         ],
-        address: [
+        serviceContent: [
-          { required: true, message: '地址不能为空', trigger: 'blur' }
+          { required: true, message: '服务内容不能为空', trigger: 'blur' }
         ],
-        /*longitude: [
+        serviceTime: [
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
+          { required: true, message: '服务时间不能为空', trigger: 'blur' }
         ],
-        latitude: [
+        applicantMobile: [
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
-        ]*/
+        ]
       }
     },