apply-clients 3.4.98-2 → 3.4.98-21

package/src/components/product/Process/Processes/addressAndUserinfoManagement.vue

@@ -1,203 +1,203 @@
-<template>
-  <work-busy :is-busy="showWork" v-show="showWork"></work-busy>
-
-  <div class="col-sm-12" style="margin: 20px 0px;">
-    <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-        </div>
-      </criteria>
-      <data-grid :model="model" v-ref:grid partial='list' class="list_area table_sy" style="padding: 0px">
-        <template partial='head'>
-          <tr>
-            <th class="textNoLineBreak">序号</th>
-            <th class="textNoLineBreak">区/县</th>
-            <th class="textNoLineBreak">片区</th>
-            <th class="textNoLineBreak">街道</th>
-            <th class="textNoLineBreak">小区</th>
-            <th class="textNoLineBreak">详细地址</th>
-            <th class="textNoLineBreak">地址状态</th>
-            <th class="textNoLineBreak">客户编号</th>
-            <th class="textNoLineBreak">用户姓名</th>
-            <th class="textNoLineBreak">电话</th>
-            <th class="textNoLineBreak">证件类型</th>
-            <th class="textNoLineBreak">证件号码</th>
-            <th class="textNoLineBreak">时间</th>
-            <th class="textNoLineBreak">备注</th>
-            <th class="textNoLineBreak">
-              <button type="button" class="btn btn-info head-but"
-                      :disabled="$parent.$parent.$parent.mark === 1"
-                      @click="$parent.$parent.$parent.showFileModal()">导入</button>
-              <a type="button" class="btn btn-info head-but"
-                 href="/apply/download/excel/批量导入.xlsx" download>模板下载</a>
-            </th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr>
-            <td style="text-align: center;">
-              <nobr>{{$index+1}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_pcd}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_slice_area}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_street}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_residential_area}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_address}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_address_state}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_userinfo_code}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_user_name}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_user_phone}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_credentials}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_idnumber}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_create_date}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_userinfo_comments}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>
-
-              </nobr>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-  <modal :show.sync="showFile" v-ref:modal backdrop="true" title="选择文件">
-    <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
-      <h4 class="modal-title">选择文件</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="form-group">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer"></footer>
-  </modal>
-</template>
-<script>
-  import {PagedList} from 'vue-client'
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '地址管理',
-    props: {
-      selectdata: {
-        type: Object
-      },
-      mark: {
-        type: Number,
-        default: 0        // 0：正常  1：禁用
-      }
-    },
-    data () {
-      return {
-        showFile: false,
-        model: new PagedList('rs/sql/getAddressAanUserinfo', 20, {
-          data: {
-            f_filialeid: this.$login.f.orgid,
-            f_process_id: this.selectdata.f_process_id
-          }
-        }),
-        showWork: false
-      }
-    },
-    ready () {
-      this.search()
-    },
-    methods: {
-      showFileModal() {
-        this.showFile = !this.showFile
-      },
-      async search () {
-        this.$refs.cp.$refs.cri.search()
-      },
-      // 关闭文件上传对话框
-      closeFile() {
-        this.showWork = false
-        this.showFile = false
-        // 将选的文件清空
-        this.$refs.file.$el.querySelector('input').value = ''
-        this.search()
-      }
-    },
-    events: {
-      'beforeFileUpload' (file) {
-        this.showWork = true
-      },
-      async 'onFileUpload'(file, result) {
-        let data = {
-          selectdata: this.selectdata,
-          filepath: result.f_downloadpath,
-          user: this.$login.f,
-          mark: this.mark
-        }
-
-        try {
-          let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data: data}, {
-            resolveMsg: null,
-            rejectMsg: '导入失败！！！',
-            silent: true
-          }, 0)
-        } catch (e) {
-          // this.closeFile()
-        } finally {
-          this.closeFile()
-        }
-
-      }
-    },
-    computed: {
-    },
-    watch: {
-      'model.count': {
-        handler: function () {
-          if (this.model.count != this.selectdata.f_apply_count) {
-            console.log(this.model.count)
-            console.log(this.selectdata.f_apply_count)
-            console.log(this.model.count !== this.selectdata.f_apply_count)
-            this.selectdata.f_apply_count = this.model.count
-          }
-        }
-      }
-    }
-  }
-</script>
-<style scoped>
-  .textNoLineBreak {
-    white-space: nowrap;
-  }
-  .head-but{
-    margin-left: 5px;
-    height: 34px;
-    /*background-color: #6aa6e2;*/
-    border-radius: 4px;
-    font-family: PingFang;
-    color: #ffffff;
-  }
-</style>
+<template>
+  <work-busy :is-busy="showWork" v-show="showWork"></work-busy>
+
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+        </div>
+      </criteria>
+      <data-grid :model="model" v-ref:grid partial='list' class="list_area table_sy" style="padding: 0px">
+        <template partial='head'>
+          <tr>
+            <th class="textNoLineBreak">序号</th>
+            <th class="textNoLineBreak">区/县</th>
+            <th class="textNoLineBreak">片区</th>
+            <th class="textNoLineBreak">街道</th>
+            <th class="textNoLineBreak">小区</th>
+            <th class="textNoLineBreak">详细地址</th>
+            <th class="textNoLineBreak">地址状态</th>
+            <th class="textNoLineBreak">客户编号</th>
+            <th class="textNoLineBreak">用户姓名</th>
+            <th class="textNoLineBreak">电话</th>
+            <th class="textNoLineBreak">证件类型</th>
+            <th class="textNoLineBreak">证件号码</th>
+            <th class="textNoLineBreak">时间</th>
+            <th class="textNoLineBreak">备注</th>
+            <th class="textNoLineBreak">
+              <button type="button" class="btn btn-info head-but"
+                      :disabled="$parent.$parent.$parent.mark === 1"
+                      @click="$parent.$parent.$parent.showFileModal()">导入</button>
+              <a type="button" class="btn btn-info head-but"
+                 href="/apply/download/excel/批量导入.xlsx" download>模板下载</a>
+            </th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align: center;">
+              <nobr>{{$index+1}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_pcd}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_slice_area}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_street}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_residential_area}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_address}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_address_state}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_userinfo_code}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_user_name}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_user_phone}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_credentials}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_idnumber}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_create_date}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_userinfo_comments}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>
+
+              </nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="showFile" v-ref:modal backdrop="true" title="选择文件">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
+      <h4 class="modal-title">选择文件</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer"></footer>
+  </modal>
+</template>
+<script>
+  import {PagedList} from 'vue-client'
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '地址管理',
+    props: {
+      selectdata: {
+        type: Object
+      },
+      mark: {
+        type: Number,
+        default: 0        // 0：正常  1：禁用
+      }
+    },
+    data () {
+      return {
+        showFile: false,
+        model: new PagedList('rs/sql/getAddressAanUserinfo', 20, {
+          data: {
+            f_filialeid: this.$login.f.orgid,
+            f_process_id: this.selectdata.f_process_id
+          }
+        }),
+        showWork: false
+      }
+    },
+    ready () {
+      this.search()
+    },
+    methods: {
+      showFileModal() {
+        this.showFile = !this.showFile
+      },
+      async search () {
+        this.$refs.cp.$refs.cri.search()
+      },
+      // 关闭文件上传对话框
+      closeFile() {
+        this.showWork = false
+        this.showFile = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+        this.search()
+      }
+    },
+    events: {
+      'beforeFileUpload' (file) {
+        this.showWork = true
+      },
+      async 'onFileUpload'(file, result) {
+        let data = {
+          selectdata: this.selectdata,
+          filepath: result.f_downloadpath,
+          user: this.$login.f,
+          mark: this.mark
+        }
+
+        try {
+          let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data: data}, {
+            resolveMsg: null,
+            rejectMsg: '导入失败！！！',
+            silent: true
+          }, 0)
+        } catch (e) {
+          // this.closeFile()
+        } finally {
+          this.closeFile()
+        }
+
+      }
+    },
+    computed: {
+    },
+    watch: {
+      'model.count': {
+        handler: function () {
+          if (this.model.count != this.selectdata.f_apply_count) {
+            console.log(this.model.count)
+            console.log(this.selectdata.f_apply_count)
+            console.log(this.model.count !== this.selectdata.f_apply_count)
+            this.selectdata.f_apply_count = this.model.count
+          }
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  .textNoLineBreak {
+    white-space: nowrap;
+  }
+  .head-but{
+    margin-left: 5px;
+    height: 34px;
+    /*background-color: #6aa6e2;*/
+    border-radius: 4px;
+    font-family: PingFang;
+    color: #ffffff;
+  }
+</style>

package/src/components/product/Process/Service/ServiceControl.vue

@@ -925,7 +925,7 @@
           return
         }
         let data = {
-          operator: '*',
+          operator: '乘',
           num1: this.show_data.f_price,
           num2: this.show_data.f_install_count
         }
@@ -1303,7 +1303,7 @@
       // 合同金额失去焦点
       async 'contractMoneyChange' (index) {
         let data = {
-          operator: '+',
+          operator: '加',
           num1: this.show_data.f_contract_money || 0,
           num2: this.getLableValue('追加金额') || 0
         }

package/src/components/product/Process/ShowBackReason.vue

@@ -1,40 +1,40 @@
-<template>
-  <div style="height: auto;text-align: center" class="col-sm-12" v-if="data != null">
-      <span style="color: red;font-family: 微软雅黑;font-weight: bold;font-size: 18px">请注意被退回原因为:{{data.f_back_reason}} 退回时间：{{data.f_date}}</span>
-  </div>
-</template>
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '退回原因展示',
-    props: ['selectdata'],
-    data () {
-      return {
-        data: null
-      }
-    },
-    ready () {
-      this.searchshow()
-    },
-    methods: {
-      async searchshow () {
-        let data = {
-          tablename: 't_backcause',
-          condition: `actid = '${this.selectdata.actid}' and f_process_id = '${this.selectdata.f_process_id}'`
-        }
-        let http =  new HttpResetClass()
-        await http.load('POST', 'rs/sql/apply_singleTable', {data: data}, {resolveMsg: null, rejectMsg: '退回原因查询失败！！！'}).then(res => {
-          if (res.data.length > 0) {
-            this.data = res.data[0]
-          }
-        })
-      }
-    },
-    watch: {
-      'selectdata' () {
-        this.searchshow()
-      }
-    }
-  }
-</script>
+<template>
+  <div style="height: auto;text-align: center" class="col-sm-12" v-if="data != null">
+      <span style="color: red;font-family: 微软雅黑;font-weight: bold;font-size: 18px">请注意被退回原因为:{{data.f_back_reason}} 退回时间：{{data.f_date}}</span>
+  </div>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '退回原因展示',
+    props: ['selectdata'],
+    data () {
+      return {
+        data: null
+      }
+    },
+    ready () {
+      this.searchshow()
+    },
+    methods: {
+      async searchshow () {
+        let data = {
+          tablename: 't_backcause',
+          condition: `actid = '${this.selectdata.actid}' and f_process_id = '${this.selectdata.f_process_id}'`
+        }
+        let http =  new HttpResetClass()
+        await http.load('POST', 'rs/sql/apply_singleTable', {data: data}, {resolveMsg: null, rejectMsg: '退回原因查询失败！！！'}).then(res => {
+          if (res.data.length > 0) {
+            this.data = res.data[0]
+          }
+        })
+      }
+    },
+    watch: {
+      'selectdata' () {
+        this.searchshow()
+      }
+    }
+  }
+</script>