apply-clients 3.3.110-211 → 3.3.110-214

package/package.json

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

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

@@ -11,7 +11,8 @@
           <th class="textNoLineBreak">材料编号</th>
           <th class="textNoLineBreak">材料标识</th>
           <th class="textNoLineBreak">
-            <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加</button>
+            <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加
+            </button>
           </th>
         </tr>
       </template>
@@ -39,8 +40,11 @@
             <nobr>{{row.f_material_code}}</nobr>
           </td>
           <td style="text-align: center;">
-            <button type="button" class="button_search button_spacing" @click="$parent.$parent.updateMaterial($index,row)">修改</button>
-            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deleteMaterial(row)">删除</button>
+            <button type="button" class="button_search button_spacing"
+                    @click="$parent.$parent.updateMaterial($index,row)">修改
+            </button>
+            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deleteMaterial(row)">删除
+            </button>
           </td>
         </tr>
       </template>
@@ -55,11 +59,14 @@
         <div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
           <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
             <div class="col-sm-6 text-left">材料{{$index+1}}信息</div>
-            <div class="col-sm-6 text-right"><button
-              class="button_delete button_spacing"
-              @click.prevent="deleteDevicesinfo(i)"
-              v-if="title === '新增'"
-            >删除</button></div>
+            <div class="col-sm-6 text-right">
+              <button
+                class="button_delete button_spacing"
+                @click.prevent="deleteDevicesinfo(i)"
+                v-if="title === '新增'"
+              >删除
+              </button>
+            </div>
           </div>
           <div class="form-group col-sm-6">
             <label class="col-sm-4 control-label">选择材料：</label>
@@ -141,8 +148,12 @@
       <footer slot="modal-footer" class="modal-footer">
         <template v-if="mark !== 1">
           <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="pushMaterial()">添加材料</button>
-          <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()" :disabled="!$v.valid">确认修改</button>
+          <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()"
+                  :disabled="!$v.valid">确认修改
+          </button>
         </template>
       </footer>
     </modal>
@@ -152,6 +163,7 @@
 <script>
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
+
   export default {
     name: 'addMaterialScience',
     props: {
@@ -159,29 +171,29 @@
         type: Object
       }
     },
-    data () {
+    data() {
       return {
         onetomany: {
           rows: []
         },
-        title:'新增',
-        showMaterialModal:false,
-        materials:[
+        title: '新增',
+        showMaterialModal: false,
+        materials: [
           {
-            material:'',
-            f_material_name:'',
-            f_material_style:'',
-            f_material_unit:'',
-            f_material_number:'',
-            f_bjq_sid:'',
-            f_material_code:''
+            material: '',
+            f_material_name: '',
+            f_material_style: '',
+            f_material_unit: '',
+            f_material_number: '',
+            f_bjq_sid: '',
+            f_material_code: ''
           }
         ],
-        meterialOptions:[],
-        row:{}
+        meterialOptions: [],
+        row: {}
       }
     },
-    ready(){
+    ready() {
       this.getOnetoManyData()
     },
     methods: {
@@ -193,44 +205,44 @@
         }
         let res = await http.load(
           'POST',
-          `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable?aaa=123`,
           {data: data},
           {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
         )
         this.onetomany.rows = res.data
       },
-      async openMaterialModal () {
+      async openMaterialModal() {
         this.getMateralNames()
         this.title = '新增'
         this.materials = [
           {
-            material:'',
-            f_material_name:'',
-            f_material_style:'',
-            f_material_unit:'',
-            f_material_number:'',
-            f_bjq_sid:'',
-            f_material_code:''
+            material: '',
+            f_material_name: '',
+            f_material_style: '',
+            f_material_unit: '',
+            f_material_number: '',
+            f_bjq_sid: '',
+            f_material_code: ''
           }
         ],
           this.showMaterialModal = true
       },
-      deleteDevicesinfo (index) {
+      deleteDevicesinfo(index) {
         this.materials.splice(index, 1)
       },
-      pushMaterial () {
+      pushMaterial() {
         this.materials.push({
-          material:'',
-          f_material_name:'',
-          f_material_style:'',
-          f_material_unit:'',
-          f_material_number:'',
-          f_bjq_sid:'',
-          f_material_code:''
+          material: '',
+          f_material_name: '',
+          f_material_style: '',
+          f_material_unit: '',
+          f_material_number: '',
+          f_bjq_sid: '',
+          f_material_code: ''
         })
       },
       // 获取模态框材料
-      async getMateralNames () {
+      async getMateralNames() {
         let data = {
           condition: `1=1`
         }
@@ -244,14 +256,14 @@
 
         this.meterialOptions = res.data.map(item => {
           return {
-            'label': `${item.f_material_name}--${item.f_material_style}--${item.f_material_unit}--${item.f_material_price}`,
+            'label': `${item.f_material_name}--${item.f_material_style}`,
             'value': item
           }
         })
       },
-      modifyOtherValue (index){
-        console.log("进来了",index)
-        console.log("dddd",this.materials[index].material)
+      modifyOtherValue(index) {
+        console.log("进来了", index)
+        console.log("dddd", this.materials[index].material)
         let material = this.materials[index].material
         this.materials[index].f_material_name = material.f_material_name
         this.materials[index].f_material_style = material.f_material_style
@@ -259,16 +271,16 @@
         this.materials[index].f_material_number = material.f_material_number
       },
       // 新增材料
-      async addMaterial () {
+      async addMaterial() {
         this.title = '新增'
         let data = {
-          f_process_id : this.selectdata.f_process_id,
+          f_process_id: this.selectdata.f_process_id,
           f_operator_id: Vue.user.id,
           f_operator: Vue.user.name,
           f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
           f_orgid: Vue.user.orgid,
           f_orgname: Vue.user.orgs,
-          materials:this.materials
+          materials: this.materials
         }
         let http = new HttpResetClass()
         let res = await http.load(
@@ -278,9 +290,9 @@
         )
         this.closeMaterials()
       },
-      deleteMaterial (row) {
-        this.$showMessage('您确定要删除这条记录吗？',['confirm']).then(res =>{
-          if (res === 'confirm'){
+      deleteMaterial(row) {
+        this.$showMessage('您确定要删除这条记录吗？', ['confirm']).then(res => {
+          if (res === 'confirm') {
             let http = new HttpResetClass()
             let res = http.load(
               'DELETE',
@@ -292,23 +304,23 @@
           }
         })
       },
-      async updateMaterial (index,row) {
+      async updateMaterial(index, row) {
         this.title = '修改'
         this.row = row
         this.getMateralNames()
         this.materials = [
           {
-            material:'',
-            f_material_name:row.f_material_name,
-            f_material_style:row.f_material_style,
-            f_material_unit:row.f_material_unit,
-            f_material_number:row.f_material_number,
-            f_material_code:row.f_material_code
+            material: '',
+            f_material_name: row.f_material_name,
+            f_material_style: row.f_material_style,
+            f_material_unit: row.f_material_unit,
+            f_material_number: row.f_material_number,
+            f_material_code: row.f_material_code
           }
         ]
         this.showMaterialModal = true
       },
-      async updateConfirm () {
+      async updateConfirm() {
         let data = this.row
         data.f_material_name = this.materials[0].f_material_name
         data.f_material_style = this.materials[0].f_material_style
@@ -323,7 +335,7 @@
         )
         this.closeMaterials()
       },
-      closeMaterials () {
+      closeMaterials() {
         this.getOnetoManyData()
         this.showMaterialModal = false
       }

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

@@ -291,10 +291,6 @@ export default {
       this.$nextTick(() => {
         this.showview = true
       })
-      if ((this.show_data.f_apply_type === '工商户报建' || this.show_data.f_apply_type === '团购报建')
-        && (this.show_data.defname === '合同签订')){
-        this.contract_number()
-      }
     },
     // 金额转大写
     smalltoBIG(n) {
@@ -841,7 +837,8 @@ export default {
         f_contract_number = dir + type + nature + year + newMonth  + this.PrefixInteger(count, 3)
         console.log("触发else", f_contract_number)
       }
-      this.setLabelValue("合同编号", f_contract_number)
+      this.selectdata.f_contract_number = f_contract_number
+      this.show_data.f_contract_number = f_contract_number
       return f_contract_number
     },
     PrefixInteger(num, n) {
@@ -1485,7 +1482,10 @@ export default {
           }
         }
       }
-
+      if ((this.show_data.f_apply_type === '工商户报建' || this.show_data.f_apply_type === '团购报建')
+        && (this.show_data.defname === '报装申请')){
+        await this.contract_number()
+      }
       let res = await this.$resetpost(
         `rs/logic/ApplyProductService`,
         {data: this.show_data},

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -256,10 +256,6 @@
         this.$nextTick(() => {
           this.showview = true
         })
-        if ((this.show_data.f_apply_type === '工商户报建' || this.show_data.f_apply_type === '团购报建')
-          && (this.show_data.defname === '合同签订')){
-          this.contract_number()
-        }
       },
       // 金额转大写
       smalltoBIG(n) {
@@ -549,101 +545,6 @@
             value: item.id
           }
         })
-      },
-      async contract_number() {
-        console.log("进入编号合同编号生成",this.$login.f.orgs)
-        let f_contract_number = ''
-        const nowDate = new Date();
-        const date = {
-          year: nowDate.getFullYear(),
-          month: nowDate.getMonth() + 1,
-          day: nowDate.getDate()
-        }
-
-        function upperCaseChars(dir) {
-          let string = '';
-          switch (dir){
-            case '周口市天然气有限公司':
-              string = 'ZK'  // 当表达式的结果等于 房产 时，则执行该代码
-              break;
-            case '项城市天然气有限公司':
-              string = "XC"  // 当表达式的结果等于 自建房 时，则执行该代码
-              break;
-            case '西华县天然气有限公司':
-              string = 'XH'  // 当表达式的结果等于 商业 时，则执行该代码
-              break;
-            case '鹿邑县天然气有限公司':
-              string = 'LY'  // 当表达式的结果等于 工业 时，则执行该代码
-              break;
-            case '郸城县天然气有限公司':
-              string = 'DC'  // 当表达式的结果等于 中压 时，则执行该代码
-              break;
-            default :
-              break;  // 如果没有与表达式相同的值，则执行该代码
-          }
-          return string;
-        }
-
-        const dir = upperCaseChars(this.$login.f.orgs) //分公司
-
-        let type = 0   //类型
-        switch (this.show_data.f_entry_type){
-          case '城区':
-            type = 1  // 当表达式的结果等于 城区 时，则执行该代码
-            break;
-          case '新农村':
-            type = 2  // 当表达式的结果等于 新农村 时，则执行该代码
-            break;
-          default :
-            break;  // 如果没有与表达式相同的值，则执行该代码
-        }
-
-        let nature = 0    // 性质
-        switch (this.show_data.f_new_entry){
-          case '房产':
-            nature = 1  // 当表达式的结果等于 房产 时，则执行该代码
-            break;
-          case '自建房':
-            nature = 2  // 当表达式的结果等于 自建房 时，则执行该代码
-            break;
-          case '商业':
-            nature = 3  // 当表达式的结果等于 商业 时，则执行该代码
-            break;
-          case '工业':
-            nature = 4  // 当表达式的结果等于 工业 时，则执行该代码
-            break;
-          case '中压':
-            nature = 5  // 当表达式的结果等于 中压 时，则执行该代码
-            break;
-          default :
-            break;  // 如果没有与表达式相同的值，则执行该代码
-        }
-
-        const newMonth = date.month >= 10 ? date.month : '0' + date.month //月份
-        const dataYm = date.year + '-01-01'
-        const newYear = date.year + 1
-        const year = date.year.toString().substring(2,4) //年份
-
-
-
-        let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/contractCount', {data: {dataYm: dataYm, newYear: newYear, orgid: this.$login.f.orgid}}, {
-          resolveMsg: null,
-          rejectMsg: null
-        })
-        if (res.data[0].count === 0) {
-          f_contract_number = dir + type + nature + year + newMonth  + '001'
-          console.log("触发if", f_contract_number)
-        } else {
-          let count = res.data[0].count
-          f_contract_number = dir + type + nature + year + newMonth  + this.PrefixInteger(count, 3)
-          console.log("触发else", f_contract_number)
-        }
-        this.setLabelValue("合同编号", f_contract_number)
-        return f_contract_number
-      },
-      PrefixInteger(num, n) {
-        return (Array(n).join(0) + num).slice(-n);
       }
     },
     events:{

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

@@ -158,7 +158,7 @@
               <label class="font_normal_body">表&emsp;&emsp;号：</label>
               <input type="text" style="width:60%" class="input_search" placeholder='表号' v-model="model.f_meternumber"
                      v-on:keyup.enter="$parent.$parent.search()"
-                     condition="f_meternumber like '%{}%'">
+                     condition="meternumber like '%{}%'">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">领用人：</label>