apply-clients 3.3.216 → 3.4.1

package/src/components/product/Order/OrderApply.vue

@@ -9,39 +9,39 @@
   </div>
 </template>
 <script>
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '预约报建',
-  data () {
-    return {
-      showRight: false,
-      type: null,
-      selectdata: null
-    }
-  },
-  methods: {
-  },
-  events: {
-    'handleOrder' (type, row) {
-      this.showRight = false
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '预约报建',
+    data () {
+      return {
+        showRight: false,
+        type: null,
+        selectdata: null
+      }
+    },
+    methods: {
+    },
+    events: {
+      'handleOrder' (type, row) {
+        this.showRight = false
 
-      this.type = type
-      this.selectdata = row
+        this.type = type
+        this.selectdata = row
 
-      this.$nextTick(() => {
-        this.showRight = true
-      })
-    },
-    'search' () {
-      this.selectdata = null
-      this.showRight = false
-      this.type = null
+        this.$nextTick(() => {
+          this.showRight = true
+        })
+      },
+      'search' () {
+        this.selectdata = null
+        this.showRight = false
+        this.type = null
 
-      this.$refs.query.$refs.cp.$refs.cri.search()
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      }
+    },
+    watch: {
     }
-  },
-  watch: {
   }
-}
 </script>

package/src/components/product/Order/OrderApplyList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="col-sm-12">
     <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+      <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="form-group col-sm-3">
@@ -13,24 +13,12 @@
                 is-mul="false"
               ></res-select>
             </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">预约类型：</label>
-              <v-select
-                v-model="model.f_ordertype"
-                placeholder='预约类型'
-                condition="o.f_ordertype = '{}'"
-                :value.sync="model.f_ordertype"
-                :options='$parent.$parent.orderType'
-                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
                 v-model="model.f_orderstate"
                 placeholder='处理状态'
-                condition="o.f_orderstate = '{}'"
+                condition="f_orderstate like '%{}%'"
                 :value.sync="model.f_orderstate"
                 :options='$parent.$parent.orderState'
                 class="select select_list"
@@ -50,51 +38,63 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">预约来源：</label>
+              <label class="font_normal_body">用户类型：</label>
               <v-select
-                placeholder='预约来源'
-                v-model="model.f_order_source"
-                :value.sync="model.f_order_source"
-                condition="o.f_order_source = '{}'"
-                :options='$parent.$parent.orderSource'
+                placeholder='用户类型'
+                v-model="model.f_user_type"
+                :value.sync="model.f_user_type"
+                condition="f_user_type like '%{}%'"
+                :options='$parent.$parent.userType'
                 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>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_userinfo_code like '%{}%'" placeholder='用户编号'>
+              <label class="font_normal_body">用户性质：</label>
+              <v-select
+                placeholder='用户性质'
+                v-model="model.f_user_nature"
+                :value.sync="model.f_user_nature"
+                condition="f_user_nature like '%{}%'"
+                :options='$parent.$parent.userNature'
+                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>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_user_name like '%{}%'" placeholder='用户姓名'>
+                     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">联&ensp;系&ensp;人：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_contact"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_contact 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" v-model="model.f_phone"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_phone like '%{}%'" placeholder='联系电话'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_phone 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" v-model="model.f_address"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_address like '%{}%'" placeholder='详细地址'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_address like '%{}%'" placeholder='详细地址'>
             </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" v-model="model.f_check_user"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_check_user like '%{}%'" placeholder='审核人'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_check_user like '%{}%'" placeholder='审核人'>
             </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" v-model="model.f_process_user"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_process_user like '%{}%'" placeholder='处理人'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_process_user 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" v-model="model.f_apply_num"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="u.f_apply_num like '%{}%'" placeholder='报建编号'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_apply_num like '%{}%'" placeholder='报建编号'>
             </div>
             <div class="form-group col-sm-3">
               <label  for="startDate" class="font_normal_body">开始时间：</label>
@@ -104,7 +104,7 @@
                           :value.sync="model.startDate"
                           :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
-                          condition="o.f_orderdate >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_orderdate >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
@@ -115,7 +115,7 @@
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd 23:59:59'"
                           :show-reset-button="true"
-                          condition="o.f_orderdate <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_orderdate <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
               </datepicker>
             </div>
           </div>
@@ -125,16 +125,24 @@
         <template partial='head'>
           <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>
             <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>
-            <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;">单台额定每小时用气方量（Nm³）</th>
+            <th style="white-space: nowrap;">额定用气压力（kpa）</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>
           </tr>
         </template>
@@ -144,22 +152,22 @@
               <nobr>{{$index+1}}</nobr>
             </td>
             <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
-              <nobr>{{row.f_ordertype}}</nobr>
+              <nobr>{{row.f_apply_type}}</nobr>
             </td>
             <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
               <nobr>{{row.f_orderstate}}</nobr>
             </td>
             <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
-              <nobr>{{row.f_order_source}}</nobr>
+              <nobr>{{row.f_user_name}}</nobr>
             </td>
             <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
-              <nobr>{{row.f_userinfo_code}}</nobr>
+              <nobr>{{row.f_phone}}</nobr>
             </td>
             <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
-              <nobr>{{row.f_user_name}}</nobr>
+              <nobr>{{row.f_contact_department}}</nobr>
             </td>
             <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
-              <nobr>{{row.f_phone}}</nobr>
+              <nobr>{{row.f_usegasposition}}</nobr>
             </td>
             <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
               <nobr>{{row.f_address}}</nobr>
@@ -171,17 +179,37 @@
               <nobr>{{row.f_orderdate}}</nobr>
             </td>
             <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
-              <nobr>{{row.f_apply_num}}</nobr>
+              <nobr>{{row.f_device_name}}</nobr>
+            </td>
+            <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
+              <nobr>{{row.f_delice_type}}</nobr>
             </td>
+            <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
+              <nobr>{{row.f_delice_num}}</nobr>
+            </td>
+            <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
+              <nobr>{{row.f_usegas_amount}}</nobr>
+            </td>
+            <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
+              <nobr>{{row.f_usegas_pressure}}</nobr>
+            </td>
+            <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
+              <nobr>{{row.deu_money}}</nobr>
+            </td>
+            <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
+              <nobr>{{row.money}}</nobr>
+            </td>
+            <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
+              <nobr>{{row.money_state }}</nobr>
+            </td>
+            <td style="text-align: center;" @click="$parent.$parent.$parent.handleOrder('view', row)">
+            <nobr>{{row.money_date}}</nobr>
+          </td>
             <td style="text-align: center;">
               <button class="button_search button_spacing width-60"
                       @click="$parent.$parent.$parent.handleOrder('check', row)"
                       v-if="row.f_orderstate === '待审核'"
               >审核</button>
-              <button class="button_search button_spacing width-60"
-                      @click="$parent.$parent.$parent.handleOrder('process', row)"
-                      v-if="row.f_orderstate === '待处理' && row.f_ordertype !== '预约点火'"
-              >处理</button>
             </td>
           </tr>
         </template>
@@ -197,31 +225,20 @@
       return {
         model: new PagedList('rs/sql/getOrderApply', 20, {
           data: {
-            f_orgname: this.$login.f.orgs
+            f_orgid: this.$login.f.orgid
           }
         }),
         curorgid: [this.$login.f.orgid],
-        f_orgname:[this.$login.f.orgs],
         criteriaShow: false,
-        orderType: [
-          {'label': '预约报装', 'value': '预约报装'},
-          {'label': '预约改管', 'value': '预约改管'},
-          {'label': '预约增容', 'value': '预约增容'},
-          {'label': '预约点火', 'value': '预约点火'}
-        ],
         orderState: [
+          {'label': '待缴费', 'value': '待缴费'},
           {'label': '待审核', 'value': '待审核'},
-          {'label': '待处理', 'value': '待处理'},
           {'label': '预约成功', 'value': '预约成功'},
           {'label': '预约失败', 'value': '预约失败'}
         ],
-        orderSource: [
-          {'label': '微客服', 'value': '微客服'},
-          {'label': '呼叫中心', 'value': '呼叫中心'}
-        ],
         userType: [
-          {'label': '个人', 'value': '个人'},
-          {'label': '整体小区', 'value': '整体小区'}
+          {'label': '民用', 'value': '民用'},
+          {'label': '非民用', 'value': '非民用'}
         ],
         userNature: [
           {'label': '民用', 'value': '民用'},
@@ -232,7 +249,6 @@
     ready () {
       // 调用查询
       this.search()
-      console.log('--------------'+ JSON.stringify(this.$login.f))
     },
     events: {
     },
@@ -241,10 +257,6 @@
       handleOrder (type, row) {
         this.$dispatch('handleOrder', type, row)
       },
-      searchCondition (args) {
-        args.condition = args.condition
-        this.model.search(args.condition, args.model)
-      },
       search () {
         this.$dispatch('search')
       },
@@ -257,8 +269,7 @@
         if (val.length <= 0) {
           return
         }
-        this.curorgid = val
-        this.search()
+        this.model.params.data.orgid = val[0]
       }
     },
     computed: {

package/src/components/product/Order/OrderMessage.vue

@@ -39,17 +39,6 @@
             v-model="selectdata.f_orderremark"
           ></textarea>
         </div>
-        <div class="col-sm-12" style="min-height: 200px;max-height: 300px;margin: 10px auto" v-if="selectdata.f_fileurl">
-<!--          <a href="http://192.168.20.27:8400/zhoukou-oracle/files/2021/9/17/fd2bd8dbe150f1c99d897f3c1ac1db45.jpg" target="_blank">-->
-<!--            <img style="min-height: 150px;max-height: 200px;" src="http://192.168.20.27:8400/zhoukou-oracle/files/2021/9/17/fd2bd8dbe150f1c99d897f3c1ac1db45.jpg">-->
-<!--          </a>-->
-          <a :href="selectdata.f_fileurl" target="_blank">
-            <img style="min-height: 150px;max-height: 200px;" :src="selectdata.f_fileurl">
-          </a>
-<!--        <div class="col-sm-12 form-group" style="height: 200px!important;">-->
-<!--        <img style="margin: auto;height: 100%" :src="selectdata.f_fileurl">-->
-<!--          {{selectdata.f_fileurl}}-->
-        </div>
       </div>
       <!-- 审核信息 -->
       <div class="auto" v-if="type === 'check' || selectdata.f_orderstate !== '待审核'">
@@ -64,7 +53,7 @@
             :value-single="true"
             class="select select_list"
             :search="false"
-            width="60%" :disabled="type === 'process' || selectdata.f_orderstate !== '待审核'"
+            width="60%" :disabled="type === 'process' && selectdata.f_orderstate !== '待审核'"
             close-on-select ></v-select>
         </div>
         <div class="col-sm-12 form-group ">
@@ -75,6 +64,14 @@
             :value="selectdata.f_check_remark"
           ></textarea>
         </div>
+      </div>
+      <!-- 缴费信息 -->
+      <div class="auto" v-if="selectdata.f_user_type === '民用'">
+        <div class="col-sm-12 text-center bg-info pt-8">缴费信息</div>
+        <div class="col-sm-6 form-group" :class="[$v.f_money.required ? 'has-error' : '']">
+          <label class="font_normal_body">应缴费金额</label>
+          <input type="text" class="input_search" style="width: 60%" v-model="selectdata.f_money" :readonly="selectdata.f_orderstate === '预约成功'" />
+        </div>
         <div class="col-sm-6 form-group" v-if="type === 'process' || selectdata.f_orderstate !== '待审核'">
           <label class="font_normal_body">审&ensp;核&ensp;人</label>
           <input type="text" class="input_search" style="width: 60%" v-model="selectdata.f_check_user" readonly />
@@ -84,48 +81,11 @@
           <input type="text" class="input_search" style="width: 60%" v-model="selectdata.f_check_date" readonly />
         </div>
       </div>
-      <!-- 项目信息 -->
-      <div class="auto" v-if="selectdata.f_ordertype !== '预约点火' &&  (type === 'process' || selectdata.f_orderstate === '预约成功')">
-        <div class="col-sm-12 text-center bg-info pt-8">项目信息</div>
-        <div class="col-sm-6 form-group" v-if="selectdata.f_ordertype === '报装申请'" :class="[$v.f_apply_type.required ? 'has-error' : '']">
-          <label class="font_normal_body">报建类型</label>
-          <input type="text" v-show="false" v-validate:f_apply_type = "['required']" v-model="apply.f_apply_type">
-          <v-select
-            v-model="apply.f_apply_type"
-            :value.sync="apply.f_apply_type"
-            :options='applyType'
-            :value-single="true"
-            class="select select_list"
-            :search="false"
-            width="60%" :disabled="selectdata.f_orderstate === '预约成功'"
-            close-on-select ></v-select>
-        </div>
-        <div class="col-sm-6 form-group" v-if="selectdata.f_ordertype === '预约改管'">
-          <label class="font_normal_body">报建类型</label>
-          <input type="text" class="input_search" style="width: 60%" v-model="apply.f_apply_type" value="改管报建" readonly />
-        </div>
-        <div class="col-sm-6 form-group" v-if="selectdata.f_ordertype === '预约增容'">
-          <label class="font_normal_body">报建类型</label>
-          <input type="text" class="input_search" style="width: 60%" v-model="apply.f_apply_type" value="增容报建" readonly />
-        </div>
-        <div class="col-sm-6 form-group" v-if="selectdata.f_orderstate === '预约成功'">
-          <label class="font_normal_body">办&ensp;理&ensp;人</label>
-          <input type="text" class="input_search" style="width: 60%" v-model="selectdata.f_dispose_operator" readonly />
-        </div>
-        <div class="col-sm-6 form-group" v-if="selectdata.f_orderstate === '预约成功'">
-          <label class="font_normal_body">办理时间</label>
-          <input type="text" class="input_search" style="width: 60%" v-model="selectdata.f_disposedate" readonly />
-        </div>
-      </div>
 
       <div class="col-sm-12 text-right button-range auto" style="margin-top: 10px">
         <button class="button_search button_spacing" :disabled='!$v.valid'
                 v-if="type !== 'view' && selectdata.f_orderstate === '待审核'"
                 @click="checkOrder()">保存</button>
-        <button class="button_search button_spacing" :disabled='!$v.valid'
-                v-if="type !== 'view' && selectdata.f_orderstate === '待处理'"
-                @click="batchApply()">保存</button>
-        <button class="button_clear button_spacing" @click="cancel()">取消</button>
       </div>
     </validator>
   </div>
@@ -155,45 +115,14 @@ export default {
     }
   },
   async ready () {
-    if (this.selectdata.f_orderstate === '待处理' || this.selectdata.f_orderstate === '预约成功') {
+    if (this.selectdata.f_orderstate === '待缴费' || this.selectdata.f_orderstate === '预约成功') {
       this.check = '是'
     }
     if (this.selectdata.f_orderstate === '预约失败') {
       this.check = '否'
     }
-    if (this.selectdata.f_orderstate === '预约成功') {
-      let data = {
-        tablename: 't_apply',
-        condition: `f_process_id = '${this.selectdata.f_process_id}'`
-      }
-      let res = await this.$resetpost(
-        `rs/sql/singleTable`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: '所属项目查询失败！！！'}
-      )
-
-      this.apply = {
-        f_entry_name: res.data[0].f_entry_name,
-        f_apply_type: res.data[0].f_apply_type
-      }
-    }
   },
   methods: {
-    async batchApply () {
-      let data = {
-        selectdata: this.selectdata,
-        apply: this.apply,
-        user: this.$login.f
-      }
-
-      let res = await this.$resetpost(
-        `rs/logic/initiateOrderApply`,
-        data,
-        {resolveMsg: null,rejectMsg: '预约单处理失败！！！'}
-      )
-
-      this.cancel()
-    },
     async checkOrder () {
       let data = {
         selectdata: this.selectdata,
@@ -202,7 +131,7 @@ export default {
       }
 
       let res = await this.$resetpost(
-        `rs/logic/checkOrder`,
+        `rs/logic/checkorder`,
         data,
         {resolveMsg: null,rejectMsg: '预约单审核处理失败！！！'}
       )
@@ -216,11 +145,6 @@ export default {
   events: {
   },
   computed: {
-    applyType () {
-      return this.$appdata.getParam("报建类型").filter(item => {
-        return item.label === '工商户报建' || item.label === '散户报建' || item.label ==='开发商集体报建' || item.label ==='预埋管报建'
-      })
-    }
   },
   watch: {
   }