apply-clients 3.3.93 → 3.3.96

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

@@ -80,12 +80,6 @@
                        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.person"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="ac.person = '{}'">
-              </div>
               <div class="form-group col-sm-3">
                 <label  for="startDate" class="font_normal_body">开始时间：</label>
                 <datepicker id="startDate" placeholder="开始日期"
@@ -123,7 +117,6 @@
               <th>材料单位</th>
               <th>材料数量</th>
               <th>操作人</th>
-              <th>材料审核</th>
               <th>操作时间</th>
             </tr>
           </template>
@@ -156,9 +149,6 @@
               <td style="text-align: center;">
                 <nobr><font>{{row.f_operator}}</font></nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr><font>{{row.person}}</font></nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_operation_date}}</font></nobr>
               </td>
@@ -206,7 +196,6 @@ export default {
         'f_material_style': '材料型号',
         'f_material_unit': '材料单位',
         'f_material_number': '材料数量',
-        'person': '材料审核',
         'f_operator': '操作人',
         'f_operation_date': '操作时间'
       }

package/src/components/product/Print/IgnitionBill/IgnitionBill.vue

@@ -1,259 +1,259 @@
-<template>
-  <div class="flex-row">
-    <div 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="u.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" placeholder='客户名称' v-model="model.f_user_name"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="u.f_user_name = '{}'">
-              </div>
-              <div class="form-group col-sm-3 button-range">
-                <button class="button_export button_spacing" @click="$parent.$parent.batchPrint()">批量打印</button>
-                <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>
-                <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">电&emsp;&emsp;话：</label>
-                <input type="text" style="width: 60%" class="input_search" placeholder='电话' v-model="model.f_phone"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="u.f_phone = '{}'">
-              </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="u.f_address like '%{}%'">
-              </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="act.finishtime >= '{}'">
-                </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="act.finishtime <= '{}'">
-                </datepicker>
-              </div>
-            </div>
-          </div>
-        </criteria>
-        <data-grid :model="model" optional 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>
-            </tr>
-          </template>
-          <template partial='body'>
-            <tr >
-              <td style="text-align: center;">
-                <nobr><font>{{$index+1}}</font></nobr>
-              </td>
-              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
-                <nobr><font>{{row.f_apply_num}}</font></nobr>
-              </td>
-              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
-                <nobr><font>{{row.f_user_name}}</font></nobr>
-              </td>
-              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
-                <nobr><font>{{row.f_phone}}</font></nobr>
-              </td>
-              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
-                <nobr><font>{{row.f_address}}</font></nobr>
-              </td>
-
-              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
-                <nobr><font>{{row.f_igniter_people}}</font></nobr>
-              </td>
-              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
-                <nobr><font>{{row.finishtime}}</font></nobr>
-              </td>
-            </tr>
-          </template>
-        </data-grid>
-      </criteria-paged>
-
-      <modal :show.sync="showPrint" title="打印预览" v-ref:modal :backdrop="false">
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="colseModal()"><span>&times;</span></button>
-          <h4 class="modal-title">打印预览</h4>
-        </header>
-        <article slot="modal-body" class="modal-body">
-          <print-gnition-bill :selectdata="selectdata" :type="type" v-ref:print></print-gnition-bill>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button type="button" class="btn btn-primary" @click="print()">打印</button>
-        </footer>
-      </modal>
-
-      <modal :show.sync="showProgress" v-ref:progress :backdrop="false">
-        <header slot="modal-header" class="modal-header">
-          <h4 class="modal-title">发送打印指令中,请耐心等待...</h4>
-        </header>
-        <article slot="modal-body" class="modal-body">
-          <div class="progress" style="margin: 20px">
-            <div class="progress-bar progress-bar-success progress-bar-striped active" :style="{width: percent}">
-              {{ percent }}
-            </div>
-          </div>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-        </footer>
-      </modal>
-    </div>
-  </div>
-</template>
-
-<script>
-import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '安装项目',
-  data () {
-    return {
-      model: new PagedList('rs/sql/ignitionBillList', 30, null),
-      criteriaShow: false,
-      curorgid: [this.$login.f.orgid],
-      selectdata: null,
-      showPrint: false,
-      showProgress: false,
-      percent: 0,
-      type: 'PREVIEW'
-    }
-  },
-  ready () {
-    // 调用查询
-    this.search()
-  },
-  methods: {
-    async batchPrint () {
-      let selectPrint = this.$refs.cp.$refs.grid.getRowData()
-      if (selectPrint.length > 0) {
-        let res = await this.$showMessage(`当前数据条数: ${selectPrint.length}, 条数过大时打印时间可能会过长, 是否确认打印?`)
-        if (res == 'confirm') {
-          this.showProgress = true
-          for (let i = 0; i < selectPrint.length; i++) {
-              this.type = 'PRINT'
-              await this.getData(selectPrint[i])
-              this.print()
-              this.percent = this.getPercent(i, selectPrint.length)
-              console.log('-------------进度-----------')
-              console.log(this.percent)
-          }
-          this.showProgress = false
-          this.percent = 0
-          this.$refs.cp.$refs.grid.selectInit()
-        }
-      } else {
-        this.$showAlert('请选择要打印的单子', 'warning', 3000)
-      }
-    },
-    getPercent (num, total){
-      num = parseFloat(num);
-      total = parseFloat(total);
-      if (isNaN(num) || isNaN(total)) {
-        return "-";
-      }
-      return total <= 0? "0%" : Math.round((num / total) * 10000) / 100.0 + "%";
-    },
-    print () {
-      this.$refs.print.print()
-    },
-    colseModal () {
-      this.showPrint = false
-      this.selectdata = null
-    },
-    async click (row) {
-      this.type = 'PREVIEW'
-
-      await this.getData(row)
-
-      this.showPrint = true
-    },
-    async getData (row) {
-      this.selectdata = null
-
-      let http = new HttpResetClass()
-      let data = {
-        f_process_id: row.f_process_id,
-        actid: row.actid
-      }
-      let res = await http.load('POST', 'rs/sql/ignitionBill', {data:data}, {
-        resolveMsg: null,
-        rejectMsg: '获取点火单失败！！！'
-      })
-
-      this.selectdata = res.data[0]
-    },
-    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 u.f_orgid = '${this.curorgid[0]}'`
-      this.model.search(args.condition, args.model)
-    },
-    // 查询
-    search () {
-      this.$refs.cp.$refs.cri.search()
-    },
-    getorg (val) {
-      if (val.length <= 0) {
-        return
-      }
-      this.curorgid = val
-      this.search()
-    }
-  },
-  computed: {
-  }
-}
-</script>
-
-<style scoped>
-</style>
+<template>
+  <div class="flex-row">
+    <div 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="u.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" placeholder='客户名称' v-model="model.f_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="u.f_user_name = '{}'">
+              </div>
+              <div class="form-group col-sm-3 button-range">
+                <button class="button_export button_spacing" @click="$parent.$parent.batchPrint()">批量打印</button>
+                <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>
+                <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">电&emsp;&emsp;话：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='电话' v-model="model.f_phone"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="u.f_phone = '{}'">
+              </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="u.f_address like '%{}%'">
+              </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="act.finishtime >= '{}'">
+                </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="act.finishtime <= '{}'">
+                </datepicker>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" optional 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>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{$index+1}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_apply_num}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_user_name}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_phone}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_address}}</font></nobr>
+              </td>
+
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_igniter_people}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.finishtime}}</font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+
+      <modal :show.sync="showPrint" title="打印预览" v-ref:modal :backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="colseModal()"><span>&times;</span></button>
+          <h4 class="modal-title">打印预览</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <print-gnition-bill :selectdata="selectdata" :type="type" v-ref:print></print-gnition-bill>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" @click="print()">打印</button>
+        </footer>
+      </modal>
+
+      <modal :show.sync="showProgress" v-ref:progress :backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <h4 class="modal-title">发送打印指令中,请耐心等待...</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <div class="progress" style="margin: 20px">
+            <div class="progress-bar progress-bar-success progress-bar-striped active" :style="{width: percent}">
+              {{ percent }}
+            </div>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+        </footer>
+      </modal>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '安装项目',
+  data () {
+    return {
+      model: new PagedList('rs/sql/ignitionBillList', 30, null),
+      criteriaShow: false,
+      curorgid: [this.$login.f.orgid],
+      selectdata: null,
+      showPrint: false,
+      showProgress: false,
+      percent: 0,
+      type: 'PREVIEW'
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    async batchPrint () {
+      let selectPrint = this.$refs.cp.$refs.grid.getRowData()
+      if (selectPrint.length > 0) {
+        let res = await this.$showMessage(`当前数据条数: ${selectPrint.length}, 条数过大时打印时间可能会过长, 是否确认打印?`)
+        if (res == 'confirm') {
+          this.showProgress = true
+          for (let i = 0; i < selectPrint.length; i++) {
+              this.type = 'PRINT'
+              await this.getData(selectPrint[i])
+              this.print()
+              this.percent = this.getPercent(i, selectPrint.length)
+              console.log('-------------进度-----------')
+              console.log(this.percent)
+          }
+          this.showProgress = false
+          this.percent = 0
+          this.$refs.cp.$refs.grid.selectInit()
+        }
+      } else {
+        this.$showAlert('请选择要打印的单子', 'warning', 3000)
+      }
+    },
+    getPercent (num, total){
+      num = parseFloat(num);
+      total = parseFloat(total);
+      if (isNaN(num) || isNaN(total)) {
+        return "-";
+      }
+      return total <= 0? "0%" : Math.round((num / total) * 10000) / 100.0 + "%";
+    },
+    print () {
+      this.$refs.print.print()
+    },
+    colseModal () {
+      this.showPrint = false
+      this.selectdata = null
+    },
+    async click (row) {
+      this.type = 'PREVIEW'
+
+      await this.getData(row)
+
+      this.showPrint = true
+    },
+    async getData (row) {
+      this.selectdata = null
+
+      let http = new HttpResetClass()
+      let data = {
+        f_process_id: row.f_process_id,
+        actid: row.actid
+      }
+      let res = await http.load('POST', 'rs/sql/ignitionBill', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '获取点火单失败！！！'
+      })
+
+      this.selectdata = res.data[0]
+    },
+    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 u.f_orgid = '${this.curorgid[0]}'`
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.search()
+    }
+  },
+  computed: {
+  }
+}
+</script>
+
+<style scoped>
+</style>