apply-clients 3.3.222 → 3.4.2-FuGu-4

package/src/components/product/Stop/StopApply.vue

@@ -6,29 +6,31 @@
       </div>
     </div>
 
-    <modal v-if="showModal" :show.sync="showModal" backdrop="false" large>
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
-        <span class="modal-title"><font size="3">撤销</font></span>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <div :class="data.f_cancel_reason ? '' : 'has-error'" class="form-group">
-          <label class="control-label-justify control-label col-sm-1">撤销原因</label>
-          <div class="col-sm-9">
-            <textarea
-              class="form-control input_view" style="width: 100%" rows="5"
-              v-model="data.f_cancel_reason" :value="data.f_cancel_reason"
-            ></textarea>
+    <validator name="v">
+      <modal v-if="showModal" :show.sync="showModal" backdrop="false" large>
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
+          <span class="modal-title"><font size="3">撤销</font></span>
+        </header>
+        <article slot="modal-body" class="modal-body clearfix">
+          <div class="form-group" :class="[$v.f_cancel_reason.required ? 'has-error' : '']">
+            <label class="control-label-justify control-label col-sm-1">撤销原因</label>
+            <div class="col-sm-9">
+              <textarea
+                class="form-control input_view" style="width: 100%" rows="5"
+                v-model="selectdata.f_cancel_reason" :value="selectdata.f_cancel_reason"
+                v-validate:f_cancel_reason = "['required']"
+              ></textarea>
+            </div>
           </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button :class="!data.f_cancel_reason ? 'btn btn-default':'btn btn-primary'"
-                :disabled="!data.f_cancel_reason" type="button" @click="confirmModal()">
-          确认
-        </button>
-      </footer>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button class="btn btn-primary" :disabled="!$v.valid" type="button" @click="confirmModal()">
+            确认
+          </button>
+        </footer>
     </modal>
+    </validator>
   </div>
 </template>
 
@@ -38,7 +40,7 @@ export default {
   data () {
     return {
       showModal: false,
-      data: null
+      selectdata: null
     }
   },
   ready () {
@@ -46,13 +48,13 @@ export default {
   methods: {
     closeModal () {
       this.showModal = false
-      this.data = null
+      this.selectdata = null
 
       this.$refs.query.$refs.cp.$refs.cri.search()
     },
     async confirmModal () {
       let data = {
-        data: this.data,
+        selectdata: this.selectdata,
         user: this.$login.f
       }
 
@@ -70,7 +72,7 @@ export default {
       this.$refs.query.$refs.cp.$refs.cri.search()
     },
     'cancelStopApply' (row) {
-      this.data = row
+      this.selectdata = row
 
       this.showModal = true
     }

package/src/components/product/Stop/StopApplyList.vue

@@ -14,16 +14,17 @@
               ></res-select>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">工程编号：</label>
-              <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
+              <label class="font_normal_body">报建编号：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="search"
                      condition="f_apply_num = '{}'">
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">客户名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+              <label class="font_normal_body">项目名称：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_entry_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_entry_name like '%{}%'" placeholder='项目名称'>
             </div>
+
             <div class="form-group col-sm-2 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
@@ -37,10 +38,14 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">联系电话：</label>
-              <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
-                     v-on:keyup.enter="search"
-                     condition="f_phone like '%{}%'">
+              <label class="font_normal_body">客户名称：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">联&ensp;系&ensp;人：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_contact"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_contact like '%{}%'" placeholder='联系人'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">合同编号：</label>
@@ -73,6 +78,12 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">联系电话：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
+                     v-on:keyup.enter="search"
+                     condition="f_phone like '%{}%'">
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户地址：</label>
               <input type="text" style="width:60%" class="input_search" placeholder='用户地址' v-model="model.f_address"
@@ -87,7 +98,7 @@
                           :value.sync="model.startDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="f_apply_date >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_apply_date >= '{}'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
@@ -98,7 +109,7 @@
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="f_apply_date <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_apply_date <= '{}'">
               </datepicker>
             </div>
           </div>
@@ -109,6 +120,7 @@
           <tr>
             <th style="white-space: nowrap;">序号</th>
             <th style="white-space: nowrap;">报建编号</th>
+            <th style="white-space: nowrap;">项目名称</th>
             <th style="white-space: nowrap;">客户名称</th>
             <th style="white-space: nowrap;">联系人</th>
             <th style="white-space: nowrap;">电话</th>
@@ -133,6 +145,9 @@
             <td style="text-align: center;">
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_entry_name}}</nobr>
+            </td>
             <td style="text-align: center;">
               <nobr>{{row.f_user_name}}</nobr>
             </td>

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -7,7 +7,6 @@
 <script>
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
-  import {isEmpty} from "../../../Util";
   // Date格式化
   Date.prototype.Format = function (fmt) {
     var o = {
@@ -41,8 +40,7 @@
         data: null,    // 展示的数据
         json_datas: null, // json配置数据结构
         showview: false, // 控制显示层显示
-        show_data: null,
-        config: {}
+        show_data: null
       }
     },
     created () {
@@ -79,46 +77,16 @@
         this.data = Object.assign({}, this.data, this.selectdata)
 
         // fields 字段填充值
-        for (const item of this.data.fields) {
+        this.data.fields.forEach(item => {
           if (this.selectdata[item.field]) {
             item.value = this.selectdata[item.field]
           }
           if (this.selectdata[item.field] === 0) {
             item.value = 0
           }
-
-          if (item.type === 'select' || item.type === 'checkbox') {
-            if (item.param) {
-              let temp = this.$appdata.getParam(item.label)
-
-              if (temp && temp.length > 0) {
-                item.options = temp
-              }
-
-              if (item.paramLabel) {
-                temp = this.$appdata.getParam(item.paramLabel)
-                if (temp && temp.length > 0) {
-                  item.options = temp
-                }
-              }
-            }
-
-            if (item.ready) {
-              item.options = await this[item.ready]()
-            }
-          }
-
-          if (item.type === 'checkbox') {
-            if (this.selectdata[item.field]) {
-              item.value = JSON.parse(this.selectdata[item.field])
-            } else {
-              item.value = []
-            }
-          }
-
           item.readonly = true
           item.disabled = true
-        }
+        })
 
         // 控制组件
         if (this.data.components) {
@@ -177,329 +145,30 @@
           this.showview = true
         })
       },
-      // 金额转大写
-      smalltoBIG(n) {
-        let fraction = ['角', '分'];
-        let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-        let unit = [['元', '万', '亿'], ['', '拾', '佰', '仟']];
-        let head = n < 0 ? '欠' : '';
-        n = Math.abs(n);
-
-        let s = '';
-
-        for (var i = 0; i < fraction.length; i++) {
-          s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
-        }
-        s = s || '整';
-        n = Math.floor(n);
-
-        for (var i = 0; i < unit[0].length && n > 0; i++) {
-          let p = '';
-          for (var j = 0; j < unit[1].length && n > 0; j++) {
-            p = digit[n % 10] + unit[1][j] + p;
-            n = Math.floor(n / 10);
-          }
-          s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s;
-        }
-        return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
-      },
-      getLableValue(label) {
-        for (const item of this.show_data.fields) {
-          if (item.label === label && item.type !== 'number') {
-            return item.value || ''
-          }
-          if (item.label === label && item.type === 'number') {
-            return item.value || 0
-          }
-        }
-      },
-      getLableOptions(label) {
-        for (const item of this.show_data.fields) {
-          if (item.label === label) {
-            return item.options
-          }
-        }
-      },
-      setLabelValue(label, value) {
-        for (const item of this.show_data.fields) {
-          if (item.label === label) {
-            item.value = value
-            this.show_data[item.field] = value
-          }
-        }
-      },
-      setLabelOptions(label, options) {
-        for (const item of this.show_data.fields) {
-          if (item.label === label) {
-            item.options = options
-          }
-        }
-      },
-      async checkDuplicate(index) {
-        let http = new HttpResetClass()
-        let data = {
-          tablename: 't_apply',
-          condition: `${this.show_data.fields[index].field} = '${this.show_data.fields[index].value}'`
-        }
-        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
-          resolveMsg: null,
-          rejectMsg: `${this.show_data.fields[index].label}查询失败`
-        })
-        if (res.data.length > 0) {
-          this.show_data.fields[index].value = null
-          this.$showAlert(`${this.show_data.fields[index].label}已存在！！！`, 'warning', 3000)
-        }
-      },
-      // 获取片区
-      async getSliceArea () {
-        let data = {
-          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-          userid: this.$login.f.id
-        }
-
-        let res = await this.$resetpost(
-          `rs/search`,
-          {data: data},
-          {resolveMsg: null, rejectMsg: '片区查询失败！！！'}
-        )
-
-        return res.data.map(item => {
-          return {
-            label: item.name,
-            value: item.name
-          }
-        })
-      },
-      // 获取区县
-      async getPcd () {
-        let data = {
-          tablename: 't_pcd',
-          condition: `f_filialeid = '${this.$login.f.orgid}'`
-        }
-        let res = await this.$resetpost(
-          `rs/sql/singleTable`,
-          {data: data},
-          {resolveMsg: null, rejectMsg: '区县查询失败！！！'}
-        )
-
-        return res.data.map(item => {
-          return {
-            label: item.f_pcd,
-            value: item.f_pcd
+      // json配置数据处理
+      async initializtion() {
+        // 查询是否有当前节点快照信息,如果有使用快照数据，没有则展示最新数据
+        if (this.nodeSnapshot && this.data.nodeSnapshot) {
+          let http = new HttpResetClass()
+          let data = {
+            tablename: 't_node_snapshot',
+            condition: `actid = '${this.selectdata.actid}' and f_process_id='${this.selectdata.f_process_id}'`
           }
-        })
-      },
-      // 缴费前置
-      chargeBefore () {
-        if (Number(this.show_data.f_due_money) > Number(this.show_data.f_cumulative_payment_money) || Number(this.show_data.f_surplus_money) > 0) {
-          this.$showAlert('费用未结清！！！', 'warning', 3000)
-          throw null
-        }
-      },
-      // 施工前置
-      async constructionBefore () {
-        let http = new HttpResetClass()
-        let data = {
-          condition: `ui.f_process_id = '${this.show_data.f_process_id}' and uf.f_table_state = '待开通'`
-        }
-        let res = await http.load(
-          'POST',
-          'rs/sql/countApplyUserinfo',
-          {data: data},
-          {
+          let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
             resolveMsg: null,
-            rejectMsg: '安装明细查询失败！！！'
+            rejectMsg: null
           })
-        if (res.data[0].num > 0) {
-          this.$showAlert(`还有${res.data[0].num}户未安装，无法提交`, 'warning', 3000)
-          throw `还有${res.data[0].num}户未安装，无法提交`
-        }
-      },
-      changePipeBuild () {
-        if (this.selectdata.f_process_dep === '工程部') {
-          return 'this.getParentByType($organization$).getChildByName($工程部报装$).getChildren()'
-        }
-        if (this.selectdata.f_process_dep === '运营部') {
-          return 'this.getParentByType($organization$).getChildByName($运营部报装$).getChildren()'
-        }
-      },
-      async getDevInfo () {
-        let data = {
-          tablename: 't_dev_info',
-          condition: `f_orgid = '${this.$login.f.orgid}'`
-        }
-        let res = await this.$resetpost(
-          `rs/sql/singleTable`,
-          {data: data},
-          {resolveMsg: null, rejectMsg: '公司查询失败！！！'}
-        )
+          if (res.data.length > 0) {
+            data = JSON.parse(res.data[0].f_node_data)
 
-        return res.data.map(item => {
-          return {
-            label: item.f_dev_name,
-            value: item.f_dev_name
+            this.data.fields = data.fields
+            this.data.onetomany = data.onetomany
+            this.data.title = data.title
           }
-        })
-      },
-      async getPrice (f_price_id) {
-        console.log('=======================')
-        console.log(f_price_id)
-
-        let data = {
-          condition: `sp.f_orgid = '${this.$login.f.orgid}'`
         }
-
-        if (!isEmpty(f_price_id)) {
-          data.condition = `sp.f_orgid = '${this.$login.f.orgid}' and sp.f_price_id = ${f_price_id}`
-        }
-        let http = new HttpResetClass()
-        let res = await http.load(
-          'POST',
-          `rs/sql/applyGetPrice`,
-          {data: data},
-          {resolveMsg: null, rejectMsg: '气价查询失败！！！'}
-        )
-
-        return res.data.map(item => {
-          return {
-            label: item.f_price_name,
-            value: item
-          }
-        })
       }
     },
     events:{
-      // 终止报建初始化·
-      async 'stopApplyReadyEvent' () {
-
-        let f_is_stop = this.getLableValue('是否终止')
-
-        for (const item of this.show_data.fields) {
-          if (f_is_stop === '是') {
-            if (item.label === '终止原因') {
-              item.hidden = false
-              item.required = true
-            }
-          } else {
-            if (item.label === '终止原因') {
-              item.hidden = true
-              item.required = false
-            }
-          }
-        }
-
-        if (isEmpty(this.show_data.f_parent_process_id)) {
-          return
-        }
-        let data = {
-          condition: `f_process_id = '${this.show_data.f_parent_process_id}'`,
-          data: {
-            id: this.$login.f.id,
-            orgid: this.$login.f.orgid
-          }
-        }
-        let res = await this.$resetpost(
-          `rs/sql/supervisory`,
-          {data: data},
-          {resolveMsg: null, rejectMsg: '项目查询失败！！！'}
-        )
-        this.show_data.parentApply = res.data[0]
-      },
-      // 通气点火初始化
-      async 'gasReadyEvent' () {
-        if (!isEmpty(this.show_data.f_price_id)) {
-          let priceList = await this.getPrice(this.show_data.f_price_id)
-          this.setLabelValue('气价名称', priceList[0].value)
-        }
-
-
-        // 保险初始化显示内容
-        let f_is_insure = this.getLableValue('是否购买保险')
-        for (const item of this.show_data.fields) {
-          if (f_is_insure === '是') {
-            if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额') {
-              item.hidden = false
-              item.required = true
-            }
-            if (item.label === '保险备注') {
-              item.hidden = false
-            }
-          } else {
-            if (item.label === '保费开始日期' || item.label === '保费结束日期' || item.label === '险种' || item.label === '保费金额') {
-              item.hidden = true
-              item.required = false
-            }
-            if (item.label === '保险备注') {
-              item.hidden = true
-            }
-          }
-        }
-        // 本期保费到期时间默认一年
-        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'))
-        }
-      },
-      // 申请节点初始化
-      'applyReadyEvent' () {
-        this.$getConfig(this, 'UserAddress')
-
-        let f_address_type = this.show_data.f_address_type
-
-        for (const item of this.show_data.fields) {
-          if (f_address_type === '民用市区') {
-            if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
-              item.hidden = false
-              item.required = true
-            }
-            if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
-              item.hidden = false
-              item.required = false
-            }
-            if (item.label === '地址') {
-              item.readonly = true
-            }
-          }
-          if (f_address_type === '民用乡镇') {
-            if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
-              item.hidden = false
-              item.required = true
-            }
-            if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
-              item.hidden = false
-              item.required = false
-            }
-            if (item.label === '楼层') {
-              item.hidden = true
-              item.required = false
-            }
-            if (item.label === '地址') {
-              item.readonly = true
-            }
-          }
-          if (f_address_type === '特殊地址') {
-            if (item.label === '区/县' || item.label === '街道/乡镇') {
-              item.hidden = false
-              item.required = true
-            }
-            if (item.label === '集收单位') {
-              item.hidden = false
-              item.required = false
-            }
-            if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
-              item.hidden = true
-              item.required = false
-            }
-            if (item.label === '地址') {
-              item.readonly = false
-            }
-          }
-
-          if (this.show_data.f_apply_source === '线下发起' && item.label === '预约地址') {
-            item.hidden = true
-          }
-        }
-      },
     },
     watch: {
       deep: true

package/src/components/product/Supervisory/SupervisoryControl.vue

@@ -24,11 +24,6 @@
                             :defname="selectdata.defname">
               </apply-upload>
             </tab>
-            <div>
-            <tab header='打印预览'>
-                <apply-print-charge-node :selectdata="selectdata" :charge="charge" v-ref:print></apply-print-charge-node>
-            </tab>
-            </div>
           </tabset>
         </div>
       </div>
@@ -52,9 +47,6 @@
     created () {
     },
     methods: {
-      print () {
-        this.$refs.print.$refs.print.PrintTable()
-      },
       // 获取页面配置json文件
       async loadName () {
         let data = {