apply-clients 3.0.4 → 3.0.5-4

package/src/components/product/VueUtils/rightview/InstallCardList2.vue

@@ -4,37 +4,33 @@
       <criteria-paged :model="model" v-ref:paged :pager="false">
         <criteria partial='criteria' @condition-changed='$parent.$parent.selfSearch' v-ref:cri>
           <div novalidate class="flex-row select-overspread" partial style="white-space: nowarp;">
+            <div class="form-group col-sm-5">
+              <!-- <label>用户编号:</label> -->
+              <input  type="text" class="form-control" v-model="model.f_user_name" placeholder='联系人' condition="f_user_name like '%{}%'">
+            </div>
+            <div class="form-group col-sm-5">
+              <!-- <label>操作类型:</label> -->
               <div class="form-group">
                 <!-- <label>用户编号:</label> -->
-                <input  type="text" class="form-control width-100" v-model="model.f_userinfo_id" placeholder='报建编号' condition="f_userinfo_id = '{}'">
-              </div>
-              <div class="form-group" style="flex: 1;">
-                <!-- <label>操作类型:</label> -->
-                <v-select id="f_paytype"
-                v-model="model.f_operat_type"
-                placeholder='操作类型'
-                :value.sync="model.f_operat_type"
-                :options='$parent.$parent.$parent.operationtypes'
-                condition="f_operat_type = '{}'"
-                close-on-select ></v-select>
-                <partial name="cardcriteria"></partial>
-              </div>
-              <!-- <div class="form-group">
-                <partial name="cardcriteria"></partial>
-              </div> -->
-              <div class="form-group">
-                  <button class="btn btn-success width-100" @click="search()" id=base-rightVie-cardLis-查询>查询</button>
+                <input  type="text" class="form-control " v-model="model.f_phone" placeholder='电话号码' condition="f_phone like '%{}%'">
               </div>
+            </div>
+            <!-- <div class="form-group">
+              <partial name="cardcriteria"></partial>
+            </div> -->
+            <div class="form-group col-sm-2">
+              <button class="btn btn-success width-100" @click="search()" id=base-rightVie-cardLis-查询>查询</button>
+            </div>
 
           </div>
         </criteria>
         <accordion :one-at-atime="true" type="info" partial="list">
           <panel type="info" v-for="row in model.rows" :is-open="true" :is-click="false" v-show="row.type==='终止报建'">
-            <span class="panel-title row" slot="header" style="cursor: pointer;">
+            <span class="panel-title row" slot="header" @click="$parent.$parent.$parent.selected(row)" style="cursor: pointer;">
               <div class="col-sm-11">
                 <div class="row">
-                  <strong class="col-sm-4">{{row.f_userinfo_id}}</strong>
-                  <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>
+                  <div class="col-sm-4">{{row.f_apply_num}}</div>
+                  <div class="col-sm-4"></div>
                   <span class="col-sm-4">{{row.type}}</span>
                 </div>
               </div>
@@ -45,18 +41,13 @@
                     <span class="glyphicon glyphicon-th-list"></span>
                   </button>
                   <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right" style=" min-width: 60px;">
-                    <!--<li v-if="row.type === '机表收费' || row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气' || row.type === '其他收费' || row.type === '换表'">-->
-                      <!--<a href="#" @click.stop="$parent.$parent.$parent.operate('票据补打', row)">票据补打</a>-->
-                    <!--</li>-->
-                    <!-- <li v-if="row.state === 1 &&  row.type !== '档案变更' && row.type !== '新增户档案' && row.type !== '银行代扣' && row.type !== '发卡售气' && row.type !== '卡表收费'&& row.type !== '补气'"> -->
                     <li v-if="row.type === '终止报建'">
                       <a href="#" @click.stop="$parent.$parent.$parent.operate('撤销', row)">撤销</a>
                     </li>
                   </ul>
                 </dropdown>
               </div>
-
-            <!--</span>-->
+            </span>
             <div class="panel-body" v-if="$parent.$parent.$parent.isSelected(row)">
               <!--<build-apply-detail v-if="row.type === '报建收费'" :data="row"></build-apply-detail>-->
               <!--<change-apply-detail v-if="row.type === '报建费用变更'" :data="row"></change-apply-detail>-->
@@ -72,11 +63,11 @@
       </criteria-paged>
     </partial-view>
   </div>
-  </template>
-  <script>
+</template>
+<script>
   /**
-  *操作记录信息
-  */
+   *操作记录信息
+   */
   import { PagedList } from 'vue-client'
   import co from 'co'
   import AppData from '../../../../stores/AppData'
@@ -94,7 +85,7 @@
       return {
         operationtypes: this.$appdata.getParam('报建业务类型'),
         model: new PagedList(`${this.sqlurl}`, 9999,
-         {condition:'"' +'f_operator= \''+this.$login.f.name+'\''+ '"',items: '"' + this.items + '"', tablename: '"' + this.tablename + '"', orderitem: '"' + this.orderitem + '"'}),
+          {items: '"' + this.items + '"', tablename: '"' + this.tablename + '"', orderitem: '"' + this.orderitem + '"'}),
         show: false,
         asideTitle: '用户操作',
         row: Object,
@@ -104,7 +95,7 @@
     props: {
       sqlurl: {
         type: String,
-          default: 'rs/sql/getinstallrecord'
+        default: 'rs/sql/getinstallrecord'
       },
       items: {
         type: String,
@@ -156,7 +147,7 @@
         let condition = '1=1'
         // this.$refs.paged.$refs.cri.search()
         if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
-          condition += `and f_filiale = '${this.$login.f.f_fengongsi}'`
+          condition += ` and f_filiale = '${this.$login.f.f_fengongsi}'`
         }
         this.$refs.pv.load(this.sqlurl, {data: {condition: condition}}).then((a) => {
           if (a.data.length === 0) {
@@ -175,7 +166,7 @@
       operate (title, row) {
         if (title === '票据补打' && (row.type === '机表收费' || row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气')) {
           this.$resetpost('rs/sql/singleTable_OrderBy', {data: {orderitem: 'id', items: '*',
-          tablename: 't_sellinggas', condition: 'id = ' + row.id}}).then((res) => {
+              tablename: 't_sellinggas', condition: 'id = ' + row.id}}).then((res) => {
             row = Object.assign({}, row, res.data[0])
             this.$dispatch('list-select-oper', `${row.type}票据补打`, 'reissue-bill', row)
           }).catch((error) => {
@@ -187,7 +178,7 @@
           })
         } else if (title === '票据补打' && row.type === '其他收费') {
           this.$resetpost('rs/sql/singleTable_OrderBy', {data: {orderitem: 'id', items: '*',
-          tablename: 't_othercharge', condition: 'id = ' + row.id}}).then((res) => {
+              tablename: 't_othercharge', condition: 'id = ' + row.id}}).then((res) => {
             if (res.data[0].f_charge_type === '国税发票') {
               row = Object.assign({}, row, res.data[0])
               this.$dispatch('list-select-oper', `${row.type}票据补打`, 'reissue-other-bill', row)
@@ -204,7 +195,7 @@
           })
         } else if (title === '票据补打' && row.type === '换表') {
           this.$resetpost('rs/sql/singleTable_OrderBy', {data: {orderitem: 'id', items: '*',
-          tablename: 't_changemeter', condition: 'id = ' + row.id}}).then((res) => {
+              tablename: 't_changemeter', condition: 'id = ' + row.id}}).then((res) => {
             row = Object.assign({}, row, res.data[0])
             this.$dispatch('list-select-oper', `${row.type}票据补打`, 'reissue-change-meter-bill', row)
           }).catch((error) => {
@@ -264,4 +255,4 @@
       // }
     },
   }
-  </script>
+</script>

package/src/stores/ApplyLoadParams.js

@@ -6,7 +6,7 @@ let loadParamGen = async function () {
   console.log('开始加载参数，。。', ApplyGetSaleParam.gasbrands)
   if (ApplyGetSaleParam.gasbrands.length === 0 && ApplyGetSaleParam.prices.length === 0 && ApplyGetSaleParam.adjustables.length === 0 ) {
     let http = new HttpResetClass()
-    let getParams = await http.load('POST','rs/logic/getSaleInitData', {data:{f_filialeids:Vue.$login.f.f_orgids}}, {resolveMsg: null, rejectMsg: '报建获取营收参数出错！！！'})
+    let getParams = await http.load('POST','rs/logic/getSaleInitData', {data:{f_filialeids:Vue.$login.f.f_orgids}}, {resolveMsg: null, rejectMsg: null})
     console.log('获取营收参数', getParams)
     if (getParams.data) {
       ApplyLoadParams.organizeData(getParams.data)

package/src/stores/PagedListLogic.js

@@ -0,0 +1,173 @@
+import Vue from 'vue'
+import co from 'co'
+import {HttpResetClass} from 'vue-client'
+
+let postGen = function * (self, pageNo) {
+  self.seaching=true
+  yield self.http.load('POST',
+    `${self.url}?pageNo=${pageNo}&pageSize=${self.pageSize}`,
+    {data: self.params},
+    {aoteEncrypt: self.aoteEncrypt, encryKey: self.encryKey,resolveMsg: null, rejectMsg: null}
+  ).then(
+    (response) => {
+      self.seaching=false
+      self.state = '正确'
+      self.rows = response.data
+      if(self.isBlank == true){
+        let size = response.data.length % self.pageSize
+        if(pageNo == self.totalPage) {
+          for (let i = 1; i <= self.pageSize - size; i++) {
+            self.rows.push({isNuN: 'true'})
+          }
+        }
+      }
+      self.pageIndex = pageNo
+    }
+  ).catch(
+    (error) => {
+      self.seaching=false
+      self.state = '错误'
+      self.error = JSON.stringify(error)
+      throw error
+    }
+  )
+}
+
+export default class PagedListLogic {
+  //正查询标志位
+  seaching=false
+  // 用url及pageSize构造
+  // url - 加载数据的url
+  // pageSize - 每页数据个数
+  // params - 除正常查询条件外，附加到后台sql中的参数，可以为空。格式为:{参数名:参数值}
+  // sums - 需要求和的字段。格式为:{参数名:参数值}
+  // isBlank - 是否使用空行填充表格，值为true或者 false
+  // comp - 调用时的组件名，方便调试
+  constructor (url, pageSize, params, sums, isBlank, comp, aoteEncrypt, encryKey) {
+    this.url = url
+    this.pageSize = pageSize
+    this.pageIndex = 0
+    this.isBlank = isBlank
+    this.aoteEncrypt = aoteEncrypt
+    this.encryKey = encryKey
+
+    // 登记组件名
+    if (comp) {
+      this.comp = comp
+    }
+
+    // 登记参数源码，查询前，执行参数源码，获得实际参数值
+    if (params) {
+      this.paramSource = params
+    }
+    // 查询时，提交后台的参数值
+    this.params = {}
+
+    // 求和的字段
+    this.sums = sums
+    // 符合条件的数据总数
+    this.count = 0
+    // 符合条件的数据总页数
+    this.totalPage = 0
+    // 加载过来的数据
+    this.rows = []
+    // 状态，字符串型，包括：初始(默认)，查询，错误，正确
+    this.state = '初始'
+    // 出现错误时的错误内容，没找到符合条件的数据当错误处理
+    this.error = '请输入条件, 进行查询'
+
+    // 每次加载所需要的条件
+    this.condition = null
+    this.model = null
+    this.condValue = null
+    this.http = new HttpResetClass()
+
+    //初始填充数据空行
+    //isNuN标记本行是否为空行
+    if(isBlank == true) {
+      for (let i = 1; i <= pageSize; i++) {
+        this.rows.push({isNuN: 'true'})
+      }
+    }
+  }
+
+  // 执行查询过程，加载数据汇总信息
+  // condition - 查询组件产生的查询条件
+  // model - 查询组件收集到的输入数据
+  // condValue - 交给后台的查询条件，可以为空
+  search (condition, model, condValue) {
+    // 保存条件，以便加载某页时可以直接调用
+    this.condition = condition
+    this.model = model
+    this.condValue = condValue
+    this.state = '查询'
+    this.procParams()
+    this.seaching=true
+    if (this.sums) {
+      let totals = []
+      for (let key in this.sums) {
+        totals.push(key)
+        var param = {data: this.params, sums: totals}
+      }
+    } else {
+      param = {data: this.params}
+    }
+    // 发生请求时，不进行任何提醒
+    return this.http.load('POST', `${this.url}`, param, {resolveMsg: null, rejectMsg: null, aoteEncrypt: this.aoteEncrypt, encryKey: this.encryKey}).then(
+      (response) => {
+        this.seaching=false
+        this.seaching=false
+        this.state = '正确'
+        this.rows = response.data
+        this.count = response.data.length
+      }
+    ).catch(
+      (error) => {
+        this.seaching=false
+        if (error.status !== 603) {
+          this.state = '错误'
+          this.error = `提取数据出错，错误码: ${error.status}, 错误信息：${error.data}，组件：${this.comp}`
+        }
+      }
+    )
+  }
+
+  // 重新进行查询
+  refresh () {
+    this.search(this.condition, this.model, this.condValue)
+  }
+
+  // 加载一页数据
+  loadPage (pageNo) {
+    this.state = '查询'
+    let gen = postGen(this, pageNo)
+    let redata=co(gen)
+    return redata
+  }
+
+  // 处理查询参数，把condition以及condValue附加到参数列表中，condValue指后台查询条件
+  procParams () {
+    this.params.condition = this.condition
+    if (this.condValue) {
+      this.params.condValue = this.condValue
+    }
+    if (!this.paramSource) {
+      return
+    }
+    // 对附加参数进行计算
+    for (let name in this.paramSource) {
+      /*eslint-disable */
+      this.params[name] = eval(this.paramSource[name])
+      /*eslint-enable */
+    }
+  }
+
+  // 从后台删除数据，删除后，刷新界面
+  remove (url, data) {
+    Vue.delete(url, data).then(
+      () => {
+        this.refresh()
+      }
+    )
+  }
+}

package/.npmignore

@@ -1,12 +0,0 @@
-.idea/
-.DS_Store
-node_modules/
-dist/
-build
-package-lock.json
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-/node_modules.rar
-/node_modules.zip