apply-clients 3.3.2-81-test → 3.3.2-82-zk

package/build/dev-server.js

@@ -8,15 +8,9 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://192.168.20.28:8400'
-var applyinstall = 'http://192.168.20.28:8400'
+var ldap = 'http://192.168.20.28:8400/'
+var applyinstall = 'http://192.168.20.28:8400/'
 var proxyTable = {
-  '/zhoukou-oracle':{
-    target: ldap
-  },
-  '/webapps/applyinstall/excel':{
-    target: ldap
-  },
   '/wx': {
     target: ldap
   },

package/build/webpack.test.conf.js

@@ -6,6 +6,9 @@ var merge = require('webpack-merge')
 var baseConfig = require('./webpack.base.conf')
 
 var webpackConfig = merge(baseConfig, {
+  module: {
+    rules: utils.styleLoaders()
+  },
   // use inline sourcemap for karma-sourcemap-loader
   devtool: '#inline-source-map',
   resolveLoader: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.2-81-test",
+  "version": "3.3.2-82-zk",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -92,7 +92,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.24",
+    "system-clients": "3.1.87",
     "system-phone": "1.2.96",
     "url-loader": "^0.5.7",
     "vue-client": "1.24.33",

package/src/apply.js

@@ -77,7 +77,6 @@ export default function () {
   Vue.component('back-page', (resolve) => { require(['./components/product/VueUtils/ToolsPage'], resolve) })
   Vue.component('tree2', (resolve) => { require(['./components/product/VueUtils/Tree'], resolve) })
   Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
-  Vue.component('image-preview', (resolve) => { require(['./components/product/VueUtils/ImagePreview.vue'], resolve) })
   // Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/GaoPaiYi/HighMeter'], resolve) })
   Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/HighMeter'], resolve) })
 
@@ -117,21 +116,5 @@ export default function () {
   Vue.component('build-zbf-order-list', (resolve) => { require(['./components/product/Print/BuildOrder/buildZbfOrderList'], resolve) })
   Vue.component('dimission-person', (resolve) => { require(['./components/product/Process/DimissionPerson.vue'], resolve) })
   Vue.component('apply-res-select', (resolve) => { require(['./components/product/Process/ResSelect'], resolve) })
-  Vue.component('delete-address-userinfo-management', (resolve) => { require(['./components/product/Process/Processes/DeleteAddressAndUserinfoManagement.vue'], resolve) })
-  Vue.component('delete-userinfo', (resolve) => { require(['./components/product/Process/Processes/DeleteUserinfo.vue'], resolve) })
-  Vue.component('return-charge-management', (resolve) => { require(['./components/product/Process/Processes/returnChargeManagement.vue'], resolve) })
-  /** 团购主子流程合同查看**/
-  Vue.component('apply-group-contract-main', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupContractByMain'], resolve) })
-  Vue.component('apply-group-contract', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByContract'], resolve) })
-  Vue.component('apply-group-contract-list', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupContractList'], resolve) })
-  /** 主合同与附加协议**/
-  Vue.component('apply-group-agreement-main', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupAgreementByMain'], resolve) })
-  Vue.component('apply-group-agreement', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupByAgreement'], resolve) })
-  Vue.component('apply-group-agreement-list', (resolve) => { require(['./components/product/GroupByApply/ApplyGroupAgreementList'], resolve) })
-  /** 欠费统计**/
-  Vue.component('apply-unpaid-list', (resolve) => { require(['./components/product/ApplyCharge/ApplyUnpaidList.vue'], resolve) })
-  /** 附加协议记录**/
-  Vue.component('apply-agreement-list', (resolve) => { require(['./components/product/ApplyCharge/ApplyAgreementList.vue'], resolve) })
-  /** 获取所有分类的材料*/
-  Vue.component('operations-material-science', (resolve) => { require(['./components/product/Process/Processes/OperationsAddMaterialScience.vue'], resolve) })
+  Vue.component('image-preview', (resolve) => { require(['./components/product/VueUtils/ImagePreview.vue'], resolve) })
 }

package/src/applyAndroid.js

@@ -23,7 +23,7 @@ export default function () {
   Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
 
   Vue.component('app-add-material-science', (resolve) => { require(['./components/android/Process/Processes/AppAddMaterialScience'], resolve) })
-
+  Vue.component('app-add-material-science-new', (resolve) => { require(['./components/android/Process/Processes/AppAddMaterialScienceNew.vue'], resolve) })
   Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
   Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
   Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
@@ -45,7 +45,7 @@ export default function () {
   Vue.component('app-qrcode-reader', (resolve) => { require(['./components/android/AreaSelect/AppQrcodeReader'], resolve) })
   // 报建接单
   Vue.component('app-exploration-receivingorders', (resolve) => { require(['./components/android/Process/AppExplorationReceivingorders'], resolve) })
-
   Vue.component('app-input-select', (resolve) => { require(['./components/product/InputAndSelect'], resolve) })
   Vue.component('app-v-select', (resolve) => { require(['./components/product/Select'], resolve) })
+  Vue.component('app-add-set-meal', (resolve) => { require(['./components/android/Process/Processes/AppAddSetMeal'], resolve) })
 }

package/src/components/android/AppSign.vue

@@ -40,7 +40,7 @@ export default {
       this.$emit('sign-clean')
     },
     sign () {
-
+      debugger
       this.type='手机签字'
       console.log('==============签字打印this============',this)
       this.delAudioFile(this.f_sign_path)
@@ -89,7 +89,7 @@ export default {
       HostApp.__this__.getFiles(res.id)
     },
     async getFiles (fileid) {
-
+      debugger
       console.log('=========进来===============')
       let http = new HttpResetClass()
       console.log('=========进来===============')

package/src/components/android/Process/AppServiceControl.vue

@@ -456,7 +456,7 @@ export default {
           {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
         )
         console.log('打印查询的内容',restp2)
-
+        debugger
         if(restp2.length>0){
           let _this = this
           // this.$dispatch('gotoson', {
@@ -470,7 +470,7 @@ export default {
           this.excessive=false
         }else{
           this.excessive=false
-
+          debugger
           this.$dispatch('confirm')
           this.$dispatch('confirm')
           this.$dispatch('confirm')
@@ -1794,9 +1794,6 @@ export default {
         }
       }))
     },
-    'addMaterial' (price) {
-      this.setLabelValue('约定合同金额',price)
-    },
     // 选择用户档案信息
     'selectUserinfo' (row) {
       this.setLabelValue('用户编号', row.f_userinfo_code)
@@ -1809,6 +1806,9 @@ export default {
       this.show_data.f_userinfo_id = row.f_userinfo_id
       this.show_data.f_userinfo_code = row.f_userinfo_code
     },
+    'addMaterial' (price) {
+      this.setLabelValue('约定合同金额',price)
+    },
     // 地址类型失去焦点
     'addressTypeChange' (index) {
       this.setLabelValue('街道/乡镇', null)

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

@@ -8,6 +8,9 @@
           <th class="textNoLineBreak">材料型号</th>
           <th class="textNoLineBreak">材料单位</th>
           <th class="textNoLineBreak">材料数量</th>
+          <th class="textNoLineBreak">材料编号</th>
+          <th class="textNoLineBreak">材料标识</th>
+          <th class="textNoLineBreak">用户编号</th>
           <th class="textNoLineBreak">
             <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加
             </button>
@@ -31,6 +34,15 @@
           <td style="text-align: center;">
             <nobr>{{row.f_material_number}}</nobr>
           </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_bjq_sid}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_code}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_userinfo_code}}</nobr>
+          </td>
           <td style="text-align: center;">
             <button type="button" class="button_search button_spacing"
                     @click="$parent.$parent.updateMaterial($index,row)">修改
@@ -143,6 +155,48 @@
               />
             </div>
           </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label"></label>
+            <div class="col-sm-8">
+
+            </div>
+          </div>
           <div v-if=" (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建')">
             <app-qrcode-reader :istype = fmaterialname  :index = i v-show="isShow[i]"></app-qrcode-reader>
           </div>
@@ -162,9 +216,11 @@
     </modal>
   </div>
 </template>
+
 <script>
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+
 export default {
   name: 'addMaterialScience',
   props: {
@@ -177,7 +233,6 @@ export default {
       onetomany: {
         rows: []
       },
-      totalPrice:0,
       title: '新增',
       showMaterialModal: false,
       materials: [
@@ -216,10 +271,6 @@ export default {
         {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
       )
       this.onetomany.rows = res.data
-      this.totalPrice = 0
-      for (let i = 0; i < this.onetomany.rows.length; i++) {
-        this.totalPrice=this.totalPrice+(parseFloat(this.onetomany.rows[i].f_material_price)*parseFloat(this.onetomany.rows[i].f_material_number))
-      }
     },
     async openMaterialModal() {
       this.getMateralNames()
@@ -298,7 +349,6 @@ export default {
       this.title = '新增'
       let data = {
         f_process_id: this.selectdata.f_process_id,
-        f_userinfo_code: this.selectdata.f_userinfo_code,
         f_operator_id: Vue.user.id,
         f_operator: Vue.user.name,
         f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
@@ -319,10 +369,6 @@ export default {
         `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
         data
       )
-      await this.getOnetoManyData()
-      if(this.selectdata.f_apply_type='改管报建'){
-        this.$dispatch('addMaterial',  this.totalPrice)
-      }
       this.closeMaterials()
     },
     async deleteMaterial(row) {
@@ -338,10 +384,6 @@ export default {
           {data: row},
           {resolveMsg: null, rejectMsg: '材料删除失败！！！'}
         )
-        await this.getOnetoManyData()
-        if(this.selectdata.f_apply_type='改管报建'){
-          this.$dispatch('addMaterial',  this.totalPrice)
-        }
         this.closeMaterials()
       }
     }

package/src/components/android/Process/Processes/{AppAddMaterialCharge.vue → AppAddMaterialScienceNew.vue}

@@ -142,7 +142,7 @@
         <template v-if="mark !== 1">
           <span class="modal-title me-3">累计金额:{{totalmoney}}</span>
           <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="pushMaterial()">添加材料</button>
-          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addMaterialBefore()"
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addMaterial()"
                   :disabled="!$v.valid">确认添加
           </button>
           <button type="button" class="btn btn-primary" v-if="title==='修改'" @click="updateConfirm()"
@@ -151,37 +151,6 @@
         </template>
       </footer>
     </modal>
-    <modal v-if="showCharge" :show.sync="showCharge" v-ref:modal :large="true" :backdrop="false" title="收费明细">
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
-        <h4 class="modal-title">材料收费</h4>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <div class="form-group row vertical-center">
-          <label class="col-xs-4 control-label">付款方式：</label>
-          <div class="col-xs-8">
-            <input-select class="select select_list"
-                          v-model="f_payment_method"
-                          :value.sync="f_payment_method"
-                          :options='paymentMethod'
-                          @change="paymentMethodChange"
-                          :value-single="true"
-                          close-on-select ></input-select>
-          </div>
-        </div>
-        <div class="text-center" v-if="f_payment_method=='二维码'">
-          <p><b>收费金额：{{ totalmoney }}￥</b></p>
-          <div id="qrcode" class="qrcode" v-ref:qrcode></div>
-          <p>
-            等待支付，剩余&ensp;<span style="color: #ff791a">{{timeLeft}}</span>&ensp;秒
-          </p>
-          <button type="button" @click="closeQRCode">取消支付</button>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button  v-if="f_payment_method!='二维码'"  id="savebut" type="button" class="btn btn-primary" @click.prevent="addMaterial()">确认</button>
-      </footer>
-    </modal>
   </div>
 </template>
 <script>
@@ -227,16 +196,7 @@ export default {
       bjqChecklag:[],
       fmaterialname:{},
       filiale:"",
-      paymentMethod:[
-        {
-          value: '现金',
-          label: '现金'
-        },
-        {
-          value: '二维码',
-          label: '二维码'
-        }
-      ],
+      totalPrice:0,
       isShow:[false],
       charge: {
         payment_terms:[]
@@ -303,6 +263,10 @@ export default {
         {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
       )
       this.onetomany.rows = res.data
+      this.totalPrice = 0
+      for (let i = 0; i < this.onetomany.rows.length; i++) {
+        this.totalPrice=this.totalPrice+(parseFloat(this.onetomany.rows[i].f_material_price)*parseFloat(this.onetomany.rows[i].f_material_number))
+      }
     },
     async openMaterialModal() {
       this.getMateralNames()
@@ -468,6 +432,7 @@ export default {
       this.title = '新增'
       let data = {
         f_process_id: this.selectdata.f_process_id,
+        f_userinfo_code: this.selectdata.f_userinfo_code,
         f_operator_id: Vue.user.id,
         f_operator: Vue.user.name,
         f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
@@ -488,28 +453,32 @@ export default {
         `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
         data
       )
+      await this.getOnetoManyData()
+      if(this.selectdata.f_apply_type=='改管报建'){
+        this.$dispatch('addMaterial',  this.totalPrice)
+      }
       this.closeMaterials()
     },
-     saveCharge(){
-       for (let i = 0; i < this.materials.length; i++) {
-         this.charge.payment_terms.push(
-           {
-             f_payment_term: this.materials[i].f_material_name,
-             f_charge_money: this.materials[i].price,
-             f_amount_words:this.smalltoBIG(this.materials[i].price),
-             f_payment_method : '手机APP'
-           })
-       }
-       let info = {
-         apply: this.selectdata,
-         charge: this.charge,
-         user: Vue.user,
-         f_out_trade_no:this.order.f_out_trade_no
-       }
-       http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/NewAddChargeRecord`,{data:info},{
-         resolveMsg: null,
-         rejectMsg: null
-       })
+    saveCharge(){
+      for (let i = 0; i < this.materials.length; i++) {
+        this.charge.payment_terms.push(
+          {
+            f_payment_term: this.materials[i].f_material_name,
+            f_charge_money: this.materials[i].price,
+            f_amount_words:this.smalltoBIG(this.materials[i].price),
+            f_payment_method : '手机APP'
+          })
+      }
+      let info = {
+        apply: this.selectdata,
+        charge: this.charge,
+        user: Vue.user,
+        f_out_trade_no:this.order.f_out_trade_no
+      }
+      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/NewAddChargeRecord`,{data:info},{
+        resolveMsg: null,
+        rejectMsg: null
+      })
     },
     async addMaterialAfter() {
       let data = {
@@ -628,9 +597,6 @@ export default {
     }
   },
   beforeDestroy() {
-    clearInterval(this.paymentInterval)
-    clearInterval(this.orderInterval)
-    this.clearQrCode() // 清理二维码DOM
   }
 }