apply-clients 3.3.110-203 → 3.3.110-204

package/package.json

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

package/src/components/android/Process/Processes/AppChargeManagement.vue

@@ -202,7 +202,7 @@ export default {
 
       },*/
       charge: {
-        payment_terms:[{f_payment_term: '',f_charge_money: '',f_amount_words:'',f_payment_method : '掌上营业厅'}]
+        payment_terms:[{f_payment_term: '',f_charge_money: '',f_amount_words:'',f_payment_method : '手机APP'}]
       },
       order: null,
       timeLeft: 120,

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -130,6 +130,18 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">收费项目：</label>
+              <v-select
+                v-model="model.f_payment_term"
+                placeholder='请选择'
+                condition="cr.f_payment_term = '{}'"
+                :value.sync="model.f_payment_term"
+                :options='$parent.$parent.paymentTerm'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </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_payer_number"
@@ -207,6 +219,7 @@
             <th style="white-space: nowrap;">用户地址</th>
             <th style="white-space: nowrap;">身份证号</th>
             <th style="white-space: nowrap;">缴费编码</th>
+            <th style="white-space: nowrap;">收费项目</th>
             <th style="white-space: nowrap;">收费金额(退款金额)</th>
             <th style="white-space: nowrap;">付款方式</th>
             <th style="white-space: nowrap;">流水号</th>
@@ -250,6 +263,9 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_number}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_payment_term}}</font></nobr>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_money}}</font></nobr>
             </td>
@@ -299,6 +315,7 @@ export default {
       servicerList:[],
       operatorList:[],
       curuserid: [],
+      paymentTerm :[{label: '全部', value: ''}, ...this.$appdata.getParam('收费项目')],
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
       applyNatures: [{label: '全部', value: ''}], // 报建性质
       paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
@@ -337,7 +354,7 @@ export default {
     // 调用查询
     this.search()
     this.getservicer()
-    this.getoperator()
+    this.getapplyoperator()
   },
   methods: {
    async getservicer(){
@@ -360,13 +377,13 @@ export default {
      })
 })},
 
-    async getoperator(){
+    async getapplyoperator(){
       debugger
       let data = {
         condition: `1=1`
       }
       let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/sql/getOperator', {data: data}, {resolveMsg: null, rejectMsg: null})
+      let res = await http.load('POST', 'rs/sql/getapplyOperator', {data: data}, {resolveMsg: null, rejectMsg: null})
       res.data.forEach(item => {
         this.operatorList.push({
           'label': item.f_operator,
@@ -402,6 +419,7 @@ export default {
     search () {
       this.$refs.cp.$refs.cri.search()
       this.getChargeAll()
+      this.getapplyoperator()
     },
     async getChargeAll () {
       let http = new HttpResetClass()

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

@@ -87,6 +87,18 @@
                   :value-single="true"
                   close-on-select ></v-select>
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">真实流程状态：</label>
+                <v-select
+                  v-model="model.f_reality_sub_state"
+                  placeholder='流程状态'
+                  condition="f_reality_sub_state = '{}'"
+                  :value.sync="model.f_reality_sub_state"
+                  :options='$parent.$parent.showrevise'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">用气性质：</label>
                 <v-select
@@ -135,6 +147,7 @@
               <th style="white-space: nowrap;">报建类型</th>
               <th style="white-space: nowrap;">用气性质</th>
               <th style="white-space: nowrap;">流程状态</th>
+              <th style="white-space: nowrap;">真实流程状态</th>
               <th style="white-space: nowrap;">收费项目</th>
               <th style="white-space: nowrap;">合同金额</th>
               <th style="white-space: nowrap;">表号</th>
@@ -170,6 +183,9 @@
               <td style="text-align: center;">
                 <nobr><font>{{row.f_sub_state}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_reality_sub_state}}</font></nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr><font>{{row.f_payment_term}}</font></nobr>
               </td>
@@ -197,6 +213,7 @@
                     <li>
                       <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>
+                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1" @click="$parent.$parent.$parent.reviseApply(row)">修改真实流程状态</a>
                     </li>
                   </ul>
                 </dropdown>
@@ -241,7 +258,8 @@ export default {
         {label: '民用',value: '民用'},
         {label: '商业',value: '商业'},
         {label: '工业',value: '工业'}
-      ]
+      ],
+      showrevise:this.$appdata.getParam('真实流程状态')
     }
   },
   ready () {
@@ -251,6 +269,9 @@ export default {
     stopApply (row) {
       this.$dispatch('stopApply', row)
     },
+    reviseApply (row) {
+      this.$dispatch('reviseApply', row)
+    },
     click (row) {
       this.$dispatch('openApply', row, 'handle')
     },

package/src/components/product/OldApply/Monitor/MonitorApply.vue

@@ -92,6 +92,18 @@
                   :value-single="true"
                   close-on-select ></v-select>
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">真实流程状态：</label>
+                <v-select
+                  v-model="model.f_reality_sub_state"
+                  placeholder='流程状态'
+                  condition="f_reality_sub_state = '{}'"
+                  :value.sync="model.f_reality_sub_state"
+                  :options='$parent.$parent.showrevise'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">用气性质：</label>
                 <v-select
@@ -152,6 +164,7 @@
               <th style="white-space: nowrap;">报建类型</th>
               <th style="white-space: nowrap;">用气性质</th>
               <th style="white-space: nowrap;">流程状态</th>
+              <th style="white-space: nowrap;">真实流程状态</th>
               <th style="white-space: nowrap;">收费项目</th>
               <th style="white-space: nowrap;">合同金额</th>
               <th style="white-space: nowrap;">表号</th>
@@ -186,6 +199,9 @@
               <td @click="$parent.$parent.$parent.click(row)" style="text-align: center;">
                 <nobr><font>{{row.f_sub_state}}</font></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_reality_sub_state}}</font></nobr>
+              </td>
               <td @click="$parent.$parent.$parent.click(row)" style="text-align: center;">
                 <nobr><font>{{row.f_payment_term}}</font></nobr>
               </td>
@@ -245,6 +261,7 @@ export default {
         {label: '商业', value: '商业'},
         {label: '工业', value: '工业'}
       ],
+      showrevise: [{label: '全部', value: ''}, ...this.$appdata.getParam('真实流程状态')],
       stopReasons: [{label: '全部', value: ''}, ...this.$appdata.getParam('终止原因')],
       getfield: {
         'f_userinfo_code': '用户编号',
@@ -281,7 +298,10 @@ export default {
         'f_stop_reason': '终止原因',
         'f_stop_user': '终止人员',
         'f_stop_date': '终止时间',
-        'f_stop_remarks': '终止备注'
+        'f_stop_remarks': '终止备注',
+        'f_reality_sub_state': '真实流程状态',
+        'f_reality_sub_user': '修改人员',
+        'f_reality_sub_date': '修改时间'
       }
     }
   },

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

@@ -60,6 +60,35 @@
     </footer>
   </modal>
 
+
+  <modal v-if="showRevise" :show.sync="showRevise" backdrop="false" large>
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
+      <span class="modal-title"><font size="3">修改状态</font></span>
+    </header>
+    <article slot="modal-body" class="modal-body clearfix">
+      <div class="col-sm-12 form-group" :class="apply.f_reality_sub_state ? '':'has-error'">
+        <label class="control-label-justify control-label col-sm-2" style="line-height: 35px">真实流程状态</label>
+        <div class="col-sm-10">
+          <v-select
+            width="100%"
+            v-model="apply.f_reality_sub_state"
+            :value.sync="apply.f_reality_sub_state"
+            :options='showrevise'
+            class="select select_list"
+            :value-single="true"
+            close-on-select ></v-select>
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button :class="apply.f_reality_sub_state ? 'btn btn-primary' : 'btn btn-default'"
+              :disabled="!apply.f_reality_sub_state" type="button" @click="reviseApply()">
+        确认
+      </button>
+    </footer>
+  </modal>
+
 </template>
 
 <script>
@@ -74,9 +103,11 @@ export default {
       show: [true],
       showMessage: false,
       showStop: false,
+      showRevise:false,
       apply: null,
       type: null,
-      stopReasons: this.$appdata.getParam('终止原因')
+      stopReasons: this.$appdata.getParam('终止原因'),
+      showrevise:this.$appdata.getParam('真实流程状态')
     }
   },
   methods: {
@@ -94,6 +125,19 @@ export default {
 
       this.closeModal()
     },
+    async reviseApply(){
+      let data = {
+        apply: this.apply,
+        user: this.$login.f
+      }
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/logic/reviseOldApply', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '状态修改失败！！！'
+      })
+      this.closeModal()
+
+    },
     async stopApply () {
       let data = {
         apply: this.apply,
@@ -112,7 +156,7 @@ export default {
     closeModal () {
       this.showMessage = false
       this.showStop = false
-
+      this.showRevise = false
       this.apply = null
 
       this.type = null
@@ -131,6 +175,10 @@ export default {
       this.apply = apply
       this.showStop = true
     },
+    'reviseApply' (apply) {
+      this.apply = apply
+      this.showRevise = true
+    },
     'openApply' (apply, type) {
       this.showMessage = false
 

package/src/components/product/Print/BuildOrder/buildOrderList.vue

@@ -57,6 +57,18 @@
                        v-on:keyup.enter="$parent.$parent.search()"
                        condition="f_construction_unit = '{}'">
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">是否打印：</label>
+                <v-select
+                  v-model="model.f_prints_number"
+                  placeholder='是否打印'
+                  condition="  f_prints_number {}"
+                  :value.sync="model.f_prints_number"
+                  :options='$parent.$parent.isprints'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </div>
               <div class="form-group col-sm-3">
                 <label  for="startDate" class="font_normal_body">开始时间：</label>
                 <datepicker id="startDate" placeholder="开始日期"
@@ -79,6 +91,29 @@
                             condition="f_construction_date <= '{}'">
                 </datepicker>
               </div>
+
+              <div class="form-group col-sm-3">
+                <label  for="startDate" class="font_normal_body">打印开始时间：</label>
+                <datepicker id="startDate1" placeholder="打印开始日期"
+                            style="width: 60%!important;"
+                            v-model="model.startDate1"
+                            :value.sync="model.startDate1"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            :show-reset-button="true"
+                            condition="f_prints_date >= to_char('{}','yyyy-MM-dd hh24:mi:ss')">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-3">
+                <label for="endDate" class="font_normal_body">打印结束时间：</label>
+                <datepicker id="endDate1" placeholder="打印结束日期"
+                            style="width: 60%!important;"
+                            v-model="model.endDate2"
+                            :value.sync="model.endDate2"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            :show-reset-button="true"
+                            condition="f_prints_date <= to_char('{}','yyyy-MM-dd hh24:mi:ss')">
+                </datepicker>
+              </div>
             </div>
           </div>
         </criteria>
@@ -92,6 +127,8 @@
               <th>地址</th>
               <th>安装单位</th>
               <th>安装时间</th>
+              <th>打印次数</th>
+              <th>打印时间</th>
             </tr>
           </template>
           <template partial='body'>
@@ -117,6 +154,12 @@
               <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
                 <nobr><font>{{row.f_construction_date}}</font></nobr>
               </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_prints_number}}</font></nobr>
+              </td>
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+                <nobr><font>{{row.f_prints_date}}</font></nobr>
+              </td>
             </tr>
           </template>
         </data-grid>
@@ -168,7 +211,8 @@ export default {
       showProgress: false,
       percent: 0,
       type: 'PREVIEW',
-      showRow:false
+      showRow:false,
+      isprints: [{label: '全部', value: ''},{label: '是', value: '>0'},{label: '否', value: '=0'}],
     }
   },
   ready () {
@@ -181,6 +225,23 @@ export default {
       if (selectPrint.length > 0) {
         let res = await this.$showMessage(`当前数据条数: ${selectPrint.length}, 条数过大时打印时间可能会过长, 是否确认打印?`)
         if (res == 'confirm') {
+          for(var i=0;i<selectPrint.length;i++){
+            if(selectPrint[i].f_prints_number==null){
+              selectPrint[i].f_prints_number=0
+              selectPrint[i].f_prints_number ++
+            }else{
+              selectPrint[i].f_prints_number ++
+            }
+          }
+          console.log('打印内容',selectPrint)
+          let http = new HttpResetClass()
+          let data = {
+            selectPrint:selectPrint
+          }
+          let res2 = await http.load('POST', 'rs/logic/getPrintsNumber', {data:data}, {
+            resolveMsg: null,
+            rejectMsg: '保存次数值失败！！！'
+          })
           this.showProgress = true
           for (let i = 0; i < selectPrint.length; i++) {
               this.type = 'PRINT'
@@ -238,11 +299,15 @@ export default {
       this.selectdata = res.data[0]
       debugger
       console.log("打印数据 ",this.selectdata)
-      let temp = this.selectdata.f_downloadpath
-      let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
-      this.selectdata.f_downloadpath = "http://" + location.host + "/" + URL
-      debugger
-      console.log('打印地址',this.selectdata.f_downloadpath)
+      if(this.selectdata.f_downloadpath !=null){
+        let temp = this.selectdata.f_downloadpath
+        let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+        this.selectdata.f_downloadpath = "http://" + location.host + "/" + URL
+        debugger
+        console.log('打印地址',this.selectdata.f_downloadpath)
+      }else{
+        this.selectdata.f_downloadpath=''
+      }
     },
     clear () {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {

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

@@ -306,7 +306,13 @@ export default {
         'f_aroundmeter': '表向',
         'f_user_phone': '电话',
         'f_userinfo_comments': '备注',
-        'f_position': '安装位置'
+        'f_position': '安装位置',
+
+        'f_material_name': '材料名称',
+        'f_material_style': '材料型号',
+        'f_material_price': '材料价格',
+        'f_material_unit': '材料单位',
+        'f_material_number': '材料数量'
       },
       showWork: false
     }

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -166,6 +166,12 @@
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="fyr 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_operator"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_operator like '%{}%'">
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">领用状态：</label>
               <v-select
@@ -201,6 +207,7 @@
             <th style="white-space: nowrap;">缴费金额</th>
             <th style="white-space: nowrap;">领用人</th>
             <th style="white-space: nowrap;">发货人</th>
+            <th style="white-space: nowrap;">发起人</th>
           </tr>
         </template>
         <template partial='body'>
@@ -256,6 +263,9 @@
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.fyr}}</nobr>
             </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_operator}}</nobr>
+            </td>
           </tr>
         </template>
       </data-grid>
@@ -308,12 +318,15 @@
           'f_apply_date': '报建日期',
           'f_apply_remarks': '备注',
           'f_payment_remarks': '缴费备注',
-          'f_operator': '发起人',
           'f_install_project': '安装项目',
           'f_construction_unit': '施工单位',
           'f_construction_date': '施工时间',
+          'f_operator': '发起人',
+          'f_depname':'发起人部门',
           'lyr': '领用人',
+          'fdnyr':'领用人部门',
           'fyr': '发货人',
+          'fdnfr':'发货人部门',
           'meternumber':'表号'
         }
       }