apply-clients 3.3.222 → 3.4.2-FuGu-4

package/src/components/android/Process/AppExplorationUser.vue

@@ -58,6 +58,21 @@
                 close-on-select ></v-select>
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">报建性质：</label>
+            <div class="col-xs-8" >
+              <v-select
+                width="100%"
+                v-model="model.f_apply_nature"
+                placeholder='报建性质'
+                condition="f_apply_nature = '{}'"
+                :value.sync="model.f_apply_nature"
+                :options='$parent.$parent.applyNatures'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+          </div>
           <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">用户地址：</label>
             <div class="col-xs-8" >
@@ -71,9 +86,9 @@
                           style="width: 100%!important;"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
-                          condition="u.f_apply_date >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="u.f_apply_date >= '{}'">
               </datepicker>
             </div>
           </div>
@@ -84,12 +99,27 @@
                           style="width: 100%!important;"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 23:59:59'"
                           :show-reset-button="true"
-                          condition="f_apply_date <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_apply_date <= '{}'">
               </datepicker>
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">稍后处理：</label>
+            <div class="col-xs-8" >
+              <v-select
+                width="100%"
+                v-model="model.f_is_later"
+                placeholder='稍后处理'
+                condition="f_is_later = '{}'"
+                :value.sync="model.f_is_later"
+                :options='$parent.$parent.laterList'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+          </div>
           <div class="row form-group text-right" style="">
             <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
             <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
@@ -107,12 +137,19 @@
             </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>电&emsp;&emsp;话：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_phone }}</p>
+              <p class="col-xs-9 text-left input-font">
+                {{ row.f_phone }}&ensp;
+                <svg @click.prevent="$parent.$parent.$parent.dialNumber(row.f_phone)" style="width: 25px;height: 25px;position: absolute;" t="1628575136009" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2374" width="200" height="200"><path d="M682.25 465.262c0 16.695 11.115 27.811 27.81 27.811s27.812-11.116 27.812-27.811A167.395 167.395 0 0 0 570.96 298.35c-16.695 0-27.811 11.116-27.811 27.811s11.16 27.812 27.811 27.812a111.597 111.597 0 0 1 111.29 111.289z m111.289 0c0 16.695 11.115 27.811 27.81 27.811s27.812-11.116 27.812-27.811c0-152.984-125.217-278.201-278.2-278.201-16.696 0-27.812 11.16-27.812 27.855s11.16 27.811 27.811 27.811c122.405 0 222.579 100.174 222.579 222.535zM417.976 367.9c30.623-30.579 33.391-77.898 5.58-111.289L337.31 148.134c-27.811-36.16-80.666-41.74-116.869-13.928-2.768 2.812-5.536 2.812-5.536 5.58l-75.13 75.13c-72.318 72.318 30.623 267.041 217.042 453.417C543.15 854.708 735.06 954.88 807.378 885.33l75.13-75.13c33.392-33.391 33.392-86.246 0-116.825l-5.536-5.58-108.52-86.246c-33.348-27.81-80.623-25.043-111.246 5.58l-47.275 47.319c-50.087-30.623-94.593-64.014-133.564-102.941-38.927-38.971-72.275-83.478-102.898-133.565l44.507-50.043z m-38.927-75.13c8.348 11.16 8.348 27.855-2.812 36.203l-61.202 63.97a29.569 29.569 0 0 0-5.536 33.392 721.425 721.425 0 0 0 122.405 164.1 721.512 721.512 0 0 0 164.1 122.405 29.569 29.569 0 0 0 33.39-5.58l63.971-63.97c11.16-11.116 25.043-11.116 36.203-2.769l108.477 89.014s2.768 0 2.768 2.768a26.889 26.889 0 0 1 0 38.971l-75.13 75.13c-36.115 36.115-208.606-55.666-372.75-217.042-164.1-161.332-253.114-336.548-216.955-372.75l77.854-77.899c11.16-8.348 30.623-8.348 38.971 5.58l86.246 108.521z" fill="#8A8A8A" p-id="2375"></path></svg>
+              </p>
             </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_apply_num }}</p>
             </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>客户编号：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_userinfo_code }}</p>
+            </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_apply_type }}</p>
@@ -129,6 +166,10 @@
               <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_apply_date }}</p>
             </div>
+            <div class="col-xs-12" style="color: red">
+              <p class="col-xs-3 text-left font"><b>施工备注：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_construction_remarks }}</p>
+            </div>
 
             <div class="col-xs-12 text-right">
               <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">处理</button>
@@ -150,23 +191,29 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`, 20, {
       // model: new PagedList('rs/sql/checkuser', 20, {
         data: {
-          id: Vue.user.id,
+          userid: Vue.user.id,
           orgid: Vue.user.orgid
-          // id: '1626081',
-          // orgid: '1123'
+          // userid: '97036',
+          // orgid: '21142'
         }
       }),
       criteriaShow: false,
-      applytype: this.$appdata.getParam('报建类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')]:[{label: '全部', value: ''}], // 所有报建类型
-      // applytype: [{label: '全部', value: ''},{label: '散户报建', value: '散户报建'}], // 所有报建类型
-
-      defnames: [{label: '全部', value: ''}]
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+      defnames: [{label: '全部', value: ''}],
+      applyNatures: [{label: '全部', value: ''}] // 报建性质
     }
   },
   ready () {
     this.search()
   },
   methods: {
+    dialNumber (phone) {
+      this.$showMessage(`是否拨打电话：${phone}`, ['confirm']).then((res) => {
+        if (res === 'confirm') {
+          this.$androidUtil.makeAPhoneCall(phone)
+        }
+      })
+    },
     clear () {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
         this.$refs.cp.$refs.cri.model[key] = null
@@ -177,7 +224,7 @@ export default {
       this.$refs.cp.$refs.cri.search()
     },
     searchCondition (args) {
-      args.condition
+      args.condition += `and act.defname in ${this.appDefnames}`
       this.model.search(args.condition, args.model)
     },
     click (row) {
@@ -193,13 +240,17 @@ export default {
       if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
         let http = new HttpResetClass()
         http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getDefnameByType`, {
-        // http.load('POST', 'rs/logic/getDefnameByType', {
+          // http.load('POST', 'rs/logic/getDefnameByType', {
           f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
         }, {resolveMsg: null, rejectMsg: null}).then((res) => {
           this.defnames = [{label: '全部', value: ''}, ...res.data]
+
+          this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
         })
       } else {
         this.defnames = [{label: '全部', value: ''}]
+
+        this.applyNatures = [{label: '全部', value: ''}]
       }
     }
   },
@@ -209,7 +260,6 @@ export default {
   },
   computed: {
     appDefnames () {
-      // let list = [{label: '报装缴费', value: '报装缴费'}, {label: '通气点火', value: '通气点火'}]
       let list = this.$appdata.getParam('手机节点')
       return `(${list.map(item => `'${item.value}'`).toString()})`
     }
@@ -217,31 +267,31 @@ export default {
 }
 </script>
 <style scoped>
-  .panel-self{
-    border-radius: 10px;
-    border:1px solid #499EDF;
-    background-color: #F8F8F8;
-  }
-  .font{
-    font: 15px PingFang-SC-Medium;
-    color: #666666;
-  }
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
 
-  .button_shrink_top {
-    width: 34px;
-    height: 34px;
-    border: solid 1px #6aa6e2;
-    background-size: 100%;
-    background-image: url("../../../../static/newStyle/stretch_top.png")
-  }
+.button_shrink_top {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../static/newStyle/stretch_top.png")
+}
 
-  .button_shrink_bottom {
-    width: 34px;
-    height: 34px;
-    border: solid 1px #6aa6e2;
-    background-size: 100%;
-    background-image: url("../../../../static/newStyle/stretch_bottom.png")
-  }
+.button_shrink_bottom {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../static/newStyle/stretch_bottom.png")
+}
 </style>
 <style lang="less">
 .app-input {

package/src/components/android/Process/AppServiceControl.vue

@@ -422,6 +422,7 @@ export default {
       if (this.selectdata.f_process_dep === '运营部') {
         return 'this.getParentByType($organization$).getChildByName($运营部报装$).getChildren()'
       }
+      return 'this.getParentByType($organization$).getChildByName($工程部报装$).getChildren()'
     },
     async getPrice (f_price_id) {
       console.log('=======================')
@@ -458,6 +459,40 @@ export default {
     'checkRepeat' (index) {
       this.checkDuplicate(index)
     },
+    // 选择材料
+    async materialNameChenge (index, fieldIndex) {
+      let material = this.show_data.onetomany[index].fields[fieldIndex].value
+
+      this.show_data.onetomany[index].fields.forEach(item => {
+        if (material[item.field]) {
+          item.value = material[item.field]
+        }
+      })
+    },
+    // 打开模态框获取材料
+    async 'getMaterialName' (index) {
+      let data = {
+        condition: `1=1`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/getStockMaterial`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
+      )
+
+      this.show_data.onetomany[index].fields.forEach(field => {
+        if (field.label === '选择材料') {
+          field.options = res.data.map(item => {
+            return {
+              'label': `${item.f_material_name}--${item.f_material_style}--${item.f_material_unit}`,
+              'value': item
+            }
+          })
+        }
+      })
+    },
     // 选择气价
     'priceChange' (index) {
       if (isEmpty(this.show_data.stairPrice)) {
@@ -487,13 +522,10 @@ export default {
             item.hidden = false
           }
         } else {
-          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额') {
+          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额' || item.label === '保险备注') {
             item.hidden = true
             item.required = false
           }
-          if (item.label === '保险备注') {
-            item.hidden = true
-          }
         }
       }
     },
@@ -504,6 +536,36 @@ export default {
         this.setLabelValue('气价名称', priceList[0].value)
       }
 
+      let data = {
+        tablename: 't_userfees',
+        condition: `f_orgid = '${Vue.user.orgid}' and f_userinfo_id = '${this.show_data.f_userinfo_id}' and f_state = '待执行'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '保险查询失败！！！'}
+      )
+      if (res.data.length > 0) {
+        this.setLabelValue('待执行保险', '是')
+        for (const item of this.show_data.fields) {
+          if (item.label === '保费开始日期' || item.label === '是否购买保险' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额' || item.label === '保险备注') {
+            item.hidden = true
+            item.required = false
+            item.value = null
+          }
+        }
+      } else {
+        this.setLabelValue('待执行保险', '否')
+        for (const item of this.show_data.fields) {
+          if (item.label === '是否购买保险' || item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额' || item.label === '保险备注') {
+            item.hidden = false
+            item.required = true
+          }
+        }
+      }
+
       // 初始化显示内容
       let f_is_insure = this.getLableValue('是否购买保险')
       for (const item of this.show_data.fields) {
@@ -515,21 +577,19 @@ export default {
           if (item.label === '保险备注') {
             item.hidden = false
           }
-        } else {
-          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额') {
-            item.hidden = true
-            item.required = false
+          // 本期保费到期时间默认一年
+          if (isEmpty(this.selectdata.f_ins_expiration_date)) {
+            let f_ins_expiration_date = new Date().setFullYear(new Date().getFullYear() + 1)
+            this.setLabelValue("保费结束日期", new Date(f_ins_expiration_date).Format('yyyy-MM-dd'))
           }
-          if (item.label === '保险备注') {
+        }
+        if (f_is_insure === '否') {
+          if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额' || item.label === '保险备注') {
             item.hidden = true
+            item.required = false
           }
         }
       }
-      // 本期保费到期时间默认一年
-      if (isEmpty(this.selectdata.f_ins_expiration_date)) {
-        let f_ins_expiration_date = new Date().setFullYear(new Date().getFullYear() + 1)
-        this.setLabelValue("保费结束日期", new Date(f_ins_expiration_date).Format('yyyy-MM-dd'))
-      }
     },
     // 合同金额失去焦点
     async 'contractMoneyChange' (index) {
@@ -635,7 +695,10 @@ export default {
         null,
         {resolveMsg: null, rejectMsg: '删除失败！！！'}
       )
-
+      res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/rs/entity/t_apply`,
+        this.show_data
+      )
       this.breakControl()
     },
     async 'onetomanyupdate' (index, rowIndex) {
@@ -648,6 +711,10 @@ export default {
         `${this.$androidUtil.getProxyUrl()}/rs/entity/${this.show_data.onetomany[index].tables[0]}`,
         data
       )
+      res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/rs/entity/t_apply`,
+        this.show_data
+      )
       this.breakControl()
     },
     async 'onetomanyadd' (index) {
@@ -655,7 +722,7 @@ export default {
         f_process_id : this.show_data.f_process_id,
         f_operator_id: Vue.user.id,
         f_operator: Vue.user.name,
-        f_operation_date: new Date(),
+        f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
         f_orgid: Vue.user.orgid,
         f_orgname: Vue.user.orgs
       }
@@ -666,6 +733,10 @@ export default {
         `${this.$androidUtil.getProxyUrl()}/rs/entity/${this.show_data.onetomany[index].tables[0]}`,
         data
       )
+      res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/rs/entity/t_apply`,
+        this.show_data
+      )
       this.breakControl()
     },
     'onbutchange' (index) {