apply-clients 3.5.4-61 → 3.5.4-63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.5.4-61",
+  "version": "3.5.4-63",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/Material/MaterialDetailed.vue

@@ -1,268 +1,268 @@
-<template>
-  <div class="flex-row">
-    <div style="height: 95%" class="basic-main" >
-      <criteria-paged :model="model" v-ref:cp>
-        <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
-          <div class="form-horizontal select-overspread container-fluid auto" partial>
-            <div class="row">
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">组织机构：</label>
-                <res-select
-                  restype='organization'
-                  :initresid='$parent.$parent.curorgid'
-                  @res-select="$parent.$parent.getorg"
-                  is-mul="false"
-                ></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"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="a.f_apply_num like '%{}%'">
-              </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" placeholder='操作人' v-model="model.f_operator"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="ma.f_operator like '%{}%'">
-              </div>
-              <div class="form-group col-sm-3 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>
-                <export-excel :data="$parent.$parent.getCondition"
-                              :field="$parent.$parent.getfield"
-                              sqlurl="rs/logic/applyExportfile"
-                              sql-name="applyGetMaterial"
-                              template-name='材料明细导出'
-                              :choose-col="true"></export-excel>
-<!--                <div-->
-<!--                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
-<!--                  @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"-->
-<!--                  class="button_spacing"-->
-<!--                  style="float: right">-->
-<!--                </div>-->
-              </div>
-            </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_userinfo_code"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="a.f_userinfo_code 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_user_name"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="a.f_user_name like '%{}%'">
-              </div>
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">地&emsp;&emsp;址：</label>
-                <input type="text" style="width: 60%" class="input_search" placeholder='地址' v-model="model.f_address"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="a.f_address 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_material_name"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="ma.f_material_name = '{}'">
-              </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_material_style"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="ma.f_material_style = '{}'">
-              </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_material_unit"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="ma.f_material_unit = '{}'">
-              </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_material_number"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="ma.f_material_number = '{}'">
-              </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_bjq_sid"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="ma.f_bjq_sid = '{}'">
-              </div>
-              <div class="form-group col-sm-3">
-                <label  for="startDate" class="font_normal_body">开始时间：</label>
-                <datepicker id="startDate" placeholder="开始日期"
-                            style="width: 60%!important;"
-                            v-model="model.startDate"
-                            :value.sync="model.startDate"
-                            :format="'yyyy-MM-dd 00:00:00'"
-                            :show-reset-button="true"
-                            condition="ma.f_operation_date >= '{}'">
-                </datepicker>
-              </div>
-              <div class="form-group col-sm-3">
-                <label for="endDate" class="font_normal_body">结束时间：</label>
-                <datepicker id="endDate" placeholder="结束日期"
-                            style="width: 60%!important;"
-                            v-model="model.endDate"
-                            :value.sync="model.endDate"
-                            :format="'yyyy-MM-dd 23:59:59'"
-                            :show-reset-button="true"
-                            condition="ma.f_operation_date <= '{}'">
-                </datepicker>
-              </div>
-            </div>
-          </div>
-        </criteria>
-        <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
-          <template partial='head'>
-            <tr>
-              <th>序号</th>
-              <th>工程编号</th>
-              <th>客户名称</th>
-              <th>地址</th>
-              <th>材料名称</th>
-              <th>材料型号</th>
-              <th>材料单位</th>
-              <th>材料数量</th>
-              <th>报警器编号</th>
-              <th>操作人</th>
-              <th>操作时间</th>
-            </tr>
-          </template>
-          <template partial='body'>
-            <tr >
-              <td style="text-align: center;">
-                <nobr><font>{{$index+1}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.f_apply_num}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.f_user_name}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.f_address}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.f_material_name}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.f_material_style}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.f_material_unit}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.f_material_number}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.f_bjq_sid}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.f_operator}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.f_operation_date}}</font></nobr>
-              </td>
-            </tr>
-          </template>
-        </data-grid>
-
-      </criteria-paged>
-      <p class="bg-info text-center" style="font-size: 20px;height: 5%">
-        合计记录共<span style="color: red">{{chargeAll.count}}&ensp;</span>笔，
-        合计数量<span style="color: red">&ensp;{{chargeAll.sum}}&ensp;</span>元
-      </p>
-    </div>
-
-  </div>
-</template>
-
-<script>
-import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '材料明细',
-  data () {
-    return {
-      model: new PagedList('rs/sql/applyGetMaterial', 30, null),
-      curorgid: [this.$login.f.orgid],
-      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-      paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
-      chargeStatus: [
-        {label: '全部', value: ''},
-        {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'},
-        {label: '退款', value: '退款'}
-      ],
-      criteriaShow: true,
-      chargeAll: {
-        count: 0,
-        sum: 0
-      },
-      getfield: {
-        'f_apply_num': '工程编号',
-        'f_user_name': '客户名称',
-        'f_address': '地址',
-        'f_material_name': '材料名称',
-        'f_material_style': '材料型号',
-        'f_material_unit': '材料单位',
-        'f_material_number': '材料数量',
-        'f_operator': '操作人',
-        'f_operation_date': '操作时间'
-      }
-    }
-  },
-  ready () {
-    // 调用查询
-    this.search()
-  },
-  methods: {
-    clear () {
-      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-        this.$refs.cp.$refs.cri.model[key] = ''
-      })
-    },
-    searchCondition (args) {
-      args.condition = args.condition + ` and ma.f_orgid = '${this.curorgid[0]}'`
-      this.model.search(args.condition, args.model)
-    },
-    // 查询
-    search () {
-      this.$refs.cp.$refs.cri.search()
-      this.getChargeAll()
-    },
-    async getChargeAll () {
-      let http = new HttpResetClass()
-      let data = {
-        condition: this.model.condition
-      }
-      let res = await http.load('POST', 'rs/sql/getGetMaterial', {data: data}, {resolveMsg: null, rejectMsg: null})
-      console.log(res.data[0])
-      console.log('222')
-      this.chargeAll = res.data[0]
-    },
-    getorg (val) {
-      if (val.length <= 0) {
-        return
-      }
-      this.curorgid = val
-      this.search()
-    }
-  },
-  computed: {
-    getCondition () {
-      return {
-        condition: this.model.condition
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
+<template>
+  <div class="flex-row">
+    <div style="height: 95%" class="basic-main" >
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+          <div class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">组织机构：</label>
+                <res-select
+                  restype='organization'
+                  :initresid='$parent.$parent.curorgid'
+                  @res-select="$parent.$parent.getorg"
+                  is-mul="false"
+                ></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"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="a.f_apply_num like '%{}%'">
+              </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" placeholder='操作人' v-model="model.f_operator"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_operator like '%{}%'">
+              </div>
+              <div class="form-group col-sm-3 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>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="rs/logic/applyExportfile"
+                              sql-name="applyGetMaterial"
+                              template-name='材料明细导出'
+                              :choose-col="true"></export-excel>
+<!--                <div-->
+<!--                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
+<!--                  @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"-->
+<!--                  class="button_spacing"-->
+<!--                  style="float: right">-->
+<!--                </div>-->
+              </div>
+            </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_userinfo_code"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="a.f_userinfo_code 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_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="a.f_user_name like '%{}%'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">地&emsp;&emsp;址：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='地址' v-model="model.f_address"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="a.f_address 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_material_name"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_name = '{}'">
+              </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_material_style"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_style = '{}'">
+              </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_material_unit"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_unit = '{}'">
+              </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_material_number"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_number = '{}'">
+              </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_bjq_sid"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_bjq_sid = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label  for="startDate" class="font_normal_body">开始时间：</label>
+                <datepicker id="startDate" placeholder="开始日期"
+                            style="width: 60%!important;"
+                            v-model="model.startDate"
+                            :value.sync="model.startDate"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            :show-reset-button="true"
+                            condition="ma.f_operation_date >= '{}'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-3">
+                <label for="endDate" class="font_normal_body">结束时间：</label>
+                <datepicker id="endDate" placeholder="结束日期"
+                            style="width: 60%!important;"
+                            v-model="model.endDate"
+                            :value.sync="model.endDate"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            :show-reset-button="true"
+                            condition="ma.f_operation_date <= '{}'">
+                </datepicker>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>工程编号</th>
+              <th>客户名称</th>
+              <th>地址</th>
+              <th>材料名称</th>
+              <th>材料型号</th>
+              <th>材料单位</th>
+              <th>材料数量</th>
+              <th>报警器编号</th>
+              <th>操作人</th>
+              <th>操作时间</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{$index+1}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_apply_num}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_user_name}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_address}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_name}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_style}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_unit}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_number}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_bjq_sid}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_operator}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_operation_date}}</font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+
+      </criteria-paged>
+      <p class="bg-info text-center" style="font-size: 20px;height: 5%">
+        合计记录共<span style="color: red">{{chargeAll.count}}&ensp;</span>笔，
+        合计数量<span style="color: red">&ensp;{{chargeAll.sum}}&ensp;</span>
+      </p>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '材料明细',
+  data () {
+    return {
+      model: new PagedList('rs/sql/applyGetMaterial', 30, null),
+      curorgid: [this.$login.f.orgid],
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
+      chargeStatus: [
+        {label: '全部', value: ''},
+        {label: '有效', value: '有效'},
+        {label: '作废', value: '作废'},
+        {label: '退款', value: '退款'}
+      ],
+      criteriaShow: true,
+      chargeAll: {
+        count: 0,
+        sum: 0
+      },
+      getfield: {
+        'f_apply_num': '工程编号',
+        'f_user_name': '客户名称',
+        'f_address': '地址',
+        'f_material_name': '材料名称',
+        'f_material_style': '材料型号',
+        'f_material_unit': '材料单位',
+        'f_material_number': '材料数量',
+        'f_operator': '操作人',
+        'f_operation_date': '操作时间'
+      }
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = ''
+      })
+    },
+    searchCondition (args) {
+      args.condition = args.condition + ` and ma.f_orgid = '${this.curorgid[0]}'`
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+      this.getChargeAll()
+    },
+    async getChargeAll () {
+      let http = new HttpResetClass()
+      let data = {
+        condition: this.model.condition
+      }
+      let res = await http.load('POST', 'rs/sql/getGetMaterial', {data: data}, {resolveMsg: null, rejectMsg: null})
+      console.log(res.data[0])
+      console.log('222')
+      this.chargeAll = res.data[0]
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.search()
+    }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.model.condition
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>