apply-clients 7.1.19 → 7.1.24

package/package.json

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

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

@@ -17,7 +17,7 @@
                       :disabled="$parent.$parent.mark === 1"
                       @click="$parent.$parent.showFile = !$parent.$parent.showFile">导入</button>
               <a type="button" class="btn btn-info head-but"
-                 href="/apply/download/excel/安装明细.xlsx" download>模板下载</a>
+                 href="/applyinstall/Excel/v3报装表具批量导入.xlsx" download>模板下载</a>
               操作
             </th>
           </tr>

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

@@ -21,7 +21,7 @@
                       :disabled="$parent.$parent.mark === 1"
                       @click="$parent.$parent.showFileModal()">导入</button>
               <a type="button" class="btn btn-info head-but"
-                      href="/apply/download/excel/批量导入.xlsx" download>模板下载</a>
+                      href="/applyinstall/Excel/v3报装地址批量导入.xlsx" download>模板下载</a>
             </th>
           </tr>
         </template>
@@ -72,8 +72,14 @@
                   type="button"
                   name="button"
                   class="btn btn-link"
-                  @click="$parent.$parent.updateState(row.f_userinfo_id)"
+                  @click="$parent.$parent.updateState(row.f_userinfo_id,0)"
                 >操作</button>
+                <button
+                  type="button"
+                  name="button"
+                  class="btn btn-link"
+                  @click="$parent.$parent.updateState(row.f_userinfo_id,1)"
+                >撤销</button>
               </nobr>
             </td>
           </tr>
@@ -160,23 +166,40 @@ export default {
       this.$refs.file.$el.querySelector('input').value = ''
       this.search()
     },
-    updateState(f_userinfo_id) {
+    updateState(f_userinfo_id,num) {
       let http = new HttpResetClass()
       let data = {
-        f_userinfo_id: f_userinfo_id
+        f_userinfo_id: f_userinfo_id,
+        num: num
       }
-      this.$showMessage('确定要修改用户状态为不符合吗！！！', ['confirm']).then(async (res) => {
-        if (res === 'confirm') {
-          let res = await http.load('POST', 'rs/logic/updateUserinfoState', {data:data}, {
-            resolveMsg: null,
-            rejectMsg: null
-          })
-          if (res.data.length > 0) {
+      if (num == 0) {
+        this.$showMessage('确定要修改用户状态为不符合吗！！！', ['confirm']).then(async (res) => {
+          if (res === 'confirm') {
+            let res = await http.load('POST', 'rs/logic/updateUserinfoState', {data:data}, {
+              resolveMsg: null,
+              rejectMsg: null
+            })
+
             this.$showMessage("修改成功！")
             this.search()
+
           }
-        }
-      })
+        })
+      }else {
+        this.$showMessage('确定要撤销用户状态为正常吗！！！', ['confirm']).then(async (res) => {
+          if (res === 'confirm') {
+            let res = await http.load('POST', 'rs/logic/updateUserinfoState', {data:data}, {
+              resolveMsg: null,
+              rejectMsg: null
+            })
+
+            this.$showMessage("修改成功！")
+            this.search()
+
+          }
+        })
+      }
+
 
     }
   },

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

@@ -131,16 +131,16 @@
 
         // 初始化 fields 可对数据进行特殊处理
         this.initializeFields()
-
+        console.log("this.data的数据：" + JSON.stringify(this.data))
         // 初始化 buttons_fields
         for (let i = 0; i < this.data.buttons.length; i++) {
           // 下发按钮相关配置
           if (this.data.buttons[i].button_name === '下发') {
             if (this.data.buttons[i].button_fields && this.data.buttons[i].button_fields.length === 1) {
-              if (this.data.buttons[i].source){
+              if (this.data.source){
                 let http = new HttpResetClass()
                 let res = await http.load('POST', 'rs/search', {
-                  source: this.data.buttons[i].source,
+                  source: this.data.source,
                   userid: this.$login.f.id
                 }, {resolveMsg: null, rejectMsg: null})
 
@@ -336,28 +336,28 @@
         }
       },
       async buttonBefore(model) {
-        if (
-          model.button.button_name === '提交' &&
-          model.defname === '收费' &&
-          (
-            model.f_apply_type === '散户报建' ||
-            model.f_apply_type === '工业户报建' ||
-            model.f_apply_type === '商业户报建'
-          ) &&
-          model.f_surplus_money > 0
-        ) {
-          throw '未结金额大于0，无法提交！！！'
-        }
-        if (model.defname === '施工' && model.button.button_name === '提交') {
-          let http = new HttpResetClass()
-          let data = {
-            f_process_id: model.f_process_id
-          }
-          let res = await http.load('POST', 'rs/sql/notInstalled', {data: data}, {resolveMsg: null, rejectMsg: null})
-          if (res.data[0].num > 0) {
-            throw `还有${res.data[0].num}户未安装，无法提交`
-          }
-        }
+        // if (
+        //   model.button.button_name === '提交' &&
+        //   model.defname === '收费' &&
+        //   (
+        //     model.f_apply_type === '散户报建' ||
+        //     model.f_apply_type === '工业户报建' ||
+        //     model.f_apply_type === '商业户报建'
+        //   ) &&
+        //   model.f_surplus_money > 0
+        // ) {
+        //   throw '未结金额大于0，无法提交！！！'
+        // }
+        // if (model.defname === '施工' && model.button.button_name === '提交') {
+        //   let http = new HttpResetClass()
+        //   let data = {
+        //     f_process_id: model.f_process_id
+        //   }
+        //   let res = await http.load('POST', 'rs/sql/notInstalled', {data: data}, {resolveMsg: null, rejectMsg: null})
+        //   if (res.data[0].num > 0) {
+        //     throw `还有${res.data[0].num}户未安装，无法提交`
+        //   }
+        // }
         return model
       },
       // ========================= 武安 =================================

package/src/components/product/ReportForm/GasIgnitionSummary.vue

@@ -3,7 +3,7 @@
     <criteria-paged :model="model" v-ref:cp>
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
+          <div class="row col-sm-12">
 <!--            <div class="form-group col-sm-3">-->
 <!--              <label class="font_normal_body">组织机构：</label>-->
 <!--              <res-select-->
@@ -13,12 +13,31 @@
 <!--                is-mul="false"-->
 <!--              ></res-select>-->
 <!--            </div>-->
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">运营中心：</label>
+              <v-select
+                v-model="model.f_operation_center"
+                placeholder='运营中心'
+                condition="f_operation_center like '%{}%'"
+                :value.sync="model.f_operation_center"
+                :options='$parent.$parent.operationCenter'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-2">
               <label class="font_normal_body">项目名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_entry_name like '%{}%'" placeholder='项目名称'>
+              <v-select
+                v-model="model.f_entry_name"
+                placeholder='项目名称'
+                condition="f_entry_name like '%{}%'"
+                :value.sync="model.f_entry_name"
+                :options='$parent.$parent.entry_name'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
             </div>
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-2">
               <label class="font_normal_body">办卡状态：</label>
               <v-select
                 v-model="model.f_whether_hairpin"
@@ -30,7 +49,7 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-2">
               <label class="font_normal_body">报建类型：</label>
               <v-select
                 placeholder='报建类型'
@@ -47,19 +66,19 @@
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
             </div>
           </div>
-          <div class="row" v-show="$parent.$parent.criteriaShow">
+          <div class="row col-sm-12" v-show="$parent.$parent.criteriaShow">
 
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-2">
               <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">
+            <div class="form-group col-sm-2">
               <label class="font_normal_body">联系电话：</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
                      v-on:keyup.enter="$parent.$parent.search()" condition="f_user_phone like '%{}%'" placeholder='联系电话'>
             </div>
-            <div class="form-group col-sm-3">
+            <div class="form-group col-sm-2">
               <label class="font_normal_body">详细地址：</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                      v-on:keyup.enter="$parent.$parent.search()" condition="f_address like '%{}%'" placeholder='详细地址'>
@@ -72,6 +91,7 @@
           <tr>
 <!--            <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>
@@ -95,6 +115,9 @@
             <td style="text-align: center;" @click="$parent.$parent.$parent.selectOne(row)">
               <nobr>{{$index+1}}</nobr>
             </td>
+            <td style="text-align: center;" @click="$parent.$parent.$parent.selectOne(row)">
+              <nobr>{{row.f_operation_center}}</nobr>
+            </td>
             <td style="text-align: center;" @click="$parent.$parent.$parent.selectOne(row)">
               <nobr>{{row.f_entry_name}}</nobr>
             </td>
@@ -158,6 +181,8 @@ export default {
         {'label': '无卡', 'value': '无卡'},
         {'label': '正常', 'value': '正常'}
       ],
+      operationCenter: [],
+      entry_name: [],
       applyType: [
         {'label': '散户集体报装', 'value': '散户集体报装'},
         {'label': '开发商集体报装', 'value': '开发商集体报装'},
@@ -172,6 +197,8 @@ export default {
   ready () {
     // 调用查询
     this.search()
+    this.getEntry()
+    this.getOperationCenter()
   },
   events: {
   },
@@ -214,6 +241,88 @@ export default {
         return
       }
       this.model.params.data.f_orgids = val[0]
+    },
+    async getEntry() {
+      // 获取项目名称和项目编号
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_apply',
+        condition: '1 = 1'
+      }
+
+      let res = await http.load('POST','rs/sql/apply_singleTable',{data:data}, {
+        resolveMsg: null,
+        rejectMsg: '获取项目名称失败'
+      })
+      for (let i = 0; i < res.data.length; i++) {
+        //  项目名称
+        let data = []
+        let array = []
+        data = res.data.map(item => {
+          return item.f_entry_name;
+        })
+        for (let q = 0; q < data.length; q++) {
+          let arraydata = {
+            'label': data[q],
+            'value': data[q]
+          }
+          if (array.length != 0) {
+            for (let w = 0; w < array.length; w++) {
+              if (array[w].label == data[q]) {
+                break
+              }
+              while (w == array.length - 1) {
+                array.push(arraydata)
+                break
+              }
+            }
+          } else {
+            array.push(arraydata)
+          }
+        }
+        this.entry_name = array
+      }
+    },
+    async getOperationCenter() {
+      // 获取项目名称和项目编号
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_apply',
+        condition: '1 = 1'
+      }
+
+      let res = await http.load('POST','rs/sql/apply_singleTable',{data:data}, {
+        resolveMsg: null,
+        rejectMsg: '获取运营中心失败'
+      })
+      for (let i = 0; i < res.data.length; i++) {
+        //  项目名称
+        let data = []
+        let array = []
+        data = res.data.map(item => {
+          return item.f_operation_center;
+        })
+        for (let q = 0; q < data.length; q++) {
+          let arraydata = {
+            'label': data[q],
+            'value': data[q]
+          }
+          if (array.length != 0) {
+            for (let w = 0; w < array.length; w++) {
+              if (array[w].label == data[q]) {
+                break
+              }
+              while (w == array.length - 1) {
+                array.push(arraydata)
+                break
+              }
+            }
+          } else {
+            array.push(arraydata)
+          }
+        }
+        this.operationCenter = array
+      }
     }
   },
   computed: {