apply-clients 3.3.32 → 3.3.33

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -389,6 +389,11 @@
           {resolveMsg: null, rejectMsg: '删除失败！！！'}
         )
 
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
         this.$dispatch('breakControl', this.show_data)
       },
       async 'onetomanyupdate' (index, rowIndex) {
@@ -402,11 +407,21 @@
           data
         )
 
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
         this.$dispatch('breakControl', this.show_data)
       },
       async 'onetomanyadd' (index) {
         let data = {
-          f_process_id : this.show_data.f_process_id
+          f_process_id : this.show_data.f_process_id,
+          f_operator_id: this.$login.f.id,
+          f_operator: this.$login.f.name,
+          f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs
         }
         this.show_data.onetomany[index].fields.forEach(item => {
           data[item.field] = item.value
@@ -415,6 +430,12 @@
           `rs/entity/${this.show_data.onetomany[index].tables[0]}`,
           data
         )
+
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
         this.$dispatch('breakControl', this.show_data)
       }
     },

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

@@ -0,0 +1,213 @@
+<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="a.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_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_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  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>
+            </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_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_operator}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_operation_date}}</font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </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: false,
+      chargeAll: {
+        count: 0,
+        sum: 0
+      },
+      getfield: {
+        'f_apply_num': '工程编号',
+        '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()
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.search()
+    }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/src/components/product/OldApply/Handle/HandleApply.vue

@@ -181,8 +181,8 @@
                   </button>
                   <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
                     <li>
-                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('工程部派工') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1" @click="$parent.$parent.$parent.click(row)">{{row.f_sub_state}}</a>
-                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('营业厅报装') !== -1" @click="$parent.$parent.$parent.stopApply(row)">异常终止</a>
+                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('工程部派工') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1 || (this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 && row.f_sub_state === '待点火')" @click="$parent.$parent.$parent.click(row)">{{row.f_sub_state}}</a>
+                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1" @click="$parent.$parent.$parent.stopApply(row)">异常终止</a>
                     </li>
                   </ul>
                 </dropdown>

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

@@ -19,12 +19,12 @@
                        v-on:keyup.enter="$parent.$parent.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='客户名称'>
-              </div>
               <div class="form-group col-sm-3 button-range">
+                <a type="button" class="button_new button_spacing" v-if="$parent.$parent.projectStart"
+                   href="/apply/download/excel/散户报装模板.xlsx" download>模板下载</a>
+                <button class="button_new button_spacing" style="width: max-content"
+                        v-if="$parent.$parent.projectStart"
+                        @click="$parent.$parent.showFile = !$parent.$parent.showFile">批量散户导入</button>
                 <button class="button_new button_spacing" style="width: max-content"
                         v-if="$parent.$parent.projectStart"
                         @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
@@ -39,6 +39,11 @@
               </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" 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">联系电话：</label>
                 <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
@@ -214,6 +219,19 @@
         </div>
       </div>
     </modal>
+
+    <modal v-if="showFile" :show.sync="showFile" v-ref:modal :backdrop="false" 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" action="rs/file/uploadFile" tagname="确定" v-ref:file></file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer"></footer>
+    </modal>
   </div>
 </template>
 <script>
@@ -237,7 +255,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
         defnames: [{label: '全部', value: ''}], // 流程节点
         applyNatures: [{label: '全部', value: ''}], // 报建性质
-        criteriaShow: false
+        criteriaShow: false,
+        showFile: false
       }
     },
     ready () {
@@ -245,6 +264,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
       this.search()
     },
     methods: {
+      closeFile () {
+        this.showFile = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+        this.search()
+      },
       // 点击操作
       click (val) {
         this.$dispatch('apply', val)
@@ -377,6 +402,17 @@ import {HttpResetClass, PagedList} from 'vue-client'
           }
         }
       }
+    },
+    events: {
+      async 'onFileUpload'(file, result) {
+        let data = {
+          filepath: result.f_downloadpath,
+          user: this.$login.f
+        }
+        let res = await this.$resetpost(`rs/logic/importApply`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败！！！', silent: true}, 0)
+
+        this.closeFile()
+      }
     }
   }
 </script>

package/src/components/product/Process/Processes/Print/printBuildOrder.vue

@@ -35,60 +35,87 @@
       /*opacity: 0.5;*/
       z-index: -1;
     }
+    .sign {
+      vertical-align: top;
+      padding: 10px;
+    }
+    .material {
+      text-align: left;
+      vertical-align: top;
+      padding: 10px;
+    }
   </style>
 
   <div style="margin-bottom: 20px" class="form-group select-overspread">
     <label class="control-label-justify control-label col-sm-2">打印施工通知单</label>
     <div class="col-sm-10" >
-      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute">打印</button>
+      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute" @click="openModal()">打印</button>
     </div>
   </div>
 
-  <div id="print" v-show="true">
-    <h4>
-      <span class="orgs">
-        施工安装通知单
-      </span>
-    </h4>
-    <table border="1">
-      <tr>
-        <td>用户姓名</td>
-        <td>{{ selectdata.f_user_name }}</td>
-        <td>报装编号</td>
-        <td>{{ selectdata.f_apply_num }}</td>
-        <td>电&emsp;&emsp;&emsp;&emsp;话</td>
-        <td>{{ selectdata.f_phone }}</td>
-      </tr>
-      <tr>
-        <td>用户地址</td>
-        <td colspan="3">{{ selectdata.f_address }}</td>
-        <td>施工安装时间</td>
-        <td>{{ selectdata.f_construction_date }}</td>
-      </tr>
-      <tr>
-        <td>安装项目</td>
-        <td>{{ selectdata.f_install_project }}</td>
-        <td>通知时间</td>
-        <td>{{ selectdata.f_construction_unit }}</td>
-        <td>施工安装单位</td>
-        <td>{{ selectdata.f_construction_unit }}</td>
-      </tr>
-      <tr style="height: 500px;">
-        <td colspan="6">
+  <modal v-if="showModal" :show.sync="showModal" width="80%" title="打印预览" v-ref:modal large 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">
+      <div id="print">
+        <h3><span style="letter-spacing: 15px">施工安装通知单</span></h3>
+        <table border="1">
+          <tr>
+            <td>用户姓名</td>
+            <td>{{ selectdata.f_user_name }}</td>
+            <td>报装编号</td>
+            <td>{{ selectdata.f_apply_num }}</td>
+            <td>电&emsp;&emsp;&emsp;&emsp;话</td>
+            <td>{{ selectdata.f_phone }}</td>
+          </tr>
+          <tr>
+            <td>用户地址</td>
+            <td colspan="3">{{ selectdata.f_address }}</td>
+            <td>施工安装时间</td>
+            <td>{{ selectdata.f_construction_date }}</td>
+          </tr>
+          <tr>
+            <td>安装项目</td>
+            <td>{{ selectdata.f_install_project }}</td>
+            <td>通知时间</td>
+            <td>{{ selectdata.sendtime }}</td>
+            <td>施工安装单位</td>
+            <td>{{ selectdata.f_construction_unit }}</td>
+          </tr>
+          <tr>
+            <td>表号</td>
+            <td colspan="2">{{ userfile.f_meternumber }}</td>
+            <td>表封号</td>
+            <td colspan="2">{{ userfile.f_metertitles }}</td>
+          </tr>
+          <tr>
+            <td colspan="6" class="material">
+              <p>施工安装情况</p>
+              <p v-for="item in selectdata.onetomany[0].rows" style="width: auto;display: inline-block">
+                {{$index + 1}}、{{item.f_material_name}}{{item.f_material_style}}&ensp;{{item.f_material_number}}{{item.f_material_unit}}&emsp;&emsp;
+              </p>
+            </td>
+          </tr>
+          <tr style="height: 100px">
+            <td colspan="2" class="sign">施工安装单位（签字）</td>
+            <td colspan="2" class="sign">工程验收（签字）</td>
+            <td colspan="2" class="sign">用户（签字）</td>
+          </tr>
+          <tr>
+            <td>备&emsp;&emsp;注</td>
+            <td colspan="5">{{ selectdata.f_construction_remarks }}</td>
+          </tr>
+        </table>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary" @click="print()">打印</button>
+    </footer>
+  </modal>
+
 
-        </td>
-      </tr>
-      <tr style="height: 100px">
-        <td colspan="2">施工安装单位（签字）</td>
-        <td colspan="2">工程验收（签字）</td>
-        <td colspan="2">用户（签字）</td>
-      </tr>
-      <tr>
-        <td>备&emsp;&emsp;注</td>
-        <td colspan="5">{{ selectdata.f_construction_remarks }}</td>
-      </tr>
-    </table>
-  </div>
   <print-element v-show="false" v-ref:print id='print' styleid='style'
                  top='40' left='60' width='100%' height='100%'>
   </print-element>
@@ -97,6 +124,7 @@
 
 <script>
 import { isEmpty } from '../../../../Util'
+import {HttpResetClass} from "vue-client";
 Date.prototype.Format = function (fmt) {
   var o = {
     "M+": this.getMonth() + 1, //月份
@@ -124,11 +152,41 @@ export default {
     }
   },
   data () {
-    return {}
+    return {
+      showModal: false,
+      userfile: null
+    }
   },
   ready () {
   },
   methods: {
+    colseModal () {
+      this.showModal = false
+      this.userfile = null
+    },
+    print () {
+      this.$refs.print.PrintTable()
+    },
+    openModal () {
+      this.getUserFiles()
+
+      this.showModal = true
+    },
+    async getUserFiles () {
+      let data = {
+        tablename: 't_userfiles',
+        condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '表具信息查询失败！！！'}
+      )
+
+      this.userfile = res.data[0]
+    },
   },
   computed: {
     orgs () {

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

@@ -645,7 +645,7 @@ export default {
       let http = new HttpResetClass()
       let res = await http.load(
         'POST',
-        `rs/sql/getApplyMaterial`,
+        `rs/sql/getStockMaterial`,
         {data: data},
         {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
       )
@@ -1193,7 +1193,7 @@ export default {
         f_process_id : this.show_data.f_process_id,
         f_operator_id: this.$login.f.id,
         f_operator: this.$login.f.name,
-        f_operation_date: new Date(),
+        f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
         f_orgid: this.$login.f.orgid,
         f_orgname: this.$login.f.orgs
       }