apply-clients 3.1.52 → 3.1.55

package/package.json

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

package/src/components/product/Function/functions/ChargeManagement.vue

@@ -881,7 +881,7 @@ export default {
     async deleteDevice (row) {
       let data = {
         f_process_id: this.data.f_process_id,
-        f_ticket_number: row.f_ticket_number,
+        f_charge_id: row.id,
         user: this.$login.f
       }
       let res = await this.$resetpost(

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

@@ -1,467 +1,467 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'">
-        <order-apply-list v-ref:query :show-data="showData"></order-apply-list>
-      </div>
-      <div v-if="showtotal" style="height: 89%">
-      </div>
-    </div>
-  </div>
-
-  <validator name="cv">
-    <modal
-      v-if="showCheck"
-      :show.sync="showCheck"
-      backdrop="false"
-    >
-      <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 col-sm-12" :class="[$cv.check.required ? 'has-error' : '']">
-          <label class="col-sm-3 control-label" style="line-height: 35px">是否合格：</label>
-          <div class="col-sm-9">
-            <input type="text" v-show="false" v-validate:check = "['required']" v-model="check">
-            <v-select
-              v-model="check"
-              :value.sync="check"
-              :options='checkOptions'
-              :value-single="true"
-              class="select select_list"
-              :search="false"
-              width="75%"
-              close-on-select ></v-select>
-          </div>
-        </div>
-<!--        <div class="form-group col-sm-12" :class="[$cv.remark.required ? 'has-error' : '']">-->
-<!--          <label class="col-sm-3 control-label" style="line-height: 60px">审核备注：</label>-->
-<!--          <div class="col-sm-9">-->
-<!--            <textarea-->
-<!--              class="form-control input_view" style="width: 75%;height: 100%"-->
-<!--              rows="2" v-validate:remark = "['required']" placeholder="审核不合格内容将通知用户"-->
-<!--              v-model="checkRemark" :value="checkRemark"-->
-<!--            >-->
-<!--            </textarea>-->
-<!--          </div>-->
-<!--        </div>-->
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" v-if="check == '是'" @click="checkOrder()" :disabled='!$cv.valid'>确认</button>
-      </footer>
-    </modal>
-  </validator>
-
-  <validator name="tv">
-    <modal
-      v-if="showType"
-      :show.sync="showType"
-      backdrop="false"
-    >
-      <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 col-sm-12" :class="[$tv.type.required ? 'has-error' : '']">
-          <label class="col-sm-3 control-label" style="line-height: 35px">报建类型：</label>
-          <div class="col-sm-9">
-            <input type="text" v-show="false" v-validate:type = "['required']" v-model="applyType">
-            <v-select
-              placeholder='请选择需要发起的工程类型'
-              v-model="applyType"
-              :value.sync="applyType"
-              :options='$appdata.getParam("报建类型")'
-              :value-single="true"
-              class="select select_list"
-              :search="false"
-              width="75%"
-              close-on-select ></v-select>
-          </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click="applyinstall()" :disabled='!$tv.valid'>确认</button>
-      </footer>
-    </modal>
-  </validator>
-
-  <validator name="mv">
-    <modal
-      v-if="showModal"
-      :show.sync="showModal"
-      backdrop="false"
-    >
-      <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>是否确定发起报建工程吗？</div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click="mergeInitiate()" :disabled='!$mv.valid'>确认</button>
-      </footer>
-    </modal>
-  </validator>
-
-  <validator name="av">
-    <modal
-      v-if="showApply"
-      :show.sync="showApply"
-      backdrop="false"
-    >
-      <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 col-sm-12" :class="[$av.apply.required ? 'has-error' : '']">
-          <label class="col-sm-3 control-label" style="line-height: 35px">选择工程：</label>
-          <div class="col-sm-9">
-            <input type="text" v-show="false" v-validate:apply = "['required']" v-model="checkApply.id">
-            <v-select
-              placeholder='请选择需要合并的工程'
-              v-model="checkApply"
-              :value.sync="checkApply"
-              :options='applyList'
-              :value-single="true"
-              class="select select_list"
-              :search="false"
-              width="75%"
-              close-on-select ></v-select>
-          </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click="mergeApply()" :disabled='!$av.valid'>确认</button>
-      </footer>
-    </modal>
-  </validator>
-
-  <modal
-    v-if="showView"
-    :show.sync="showView"
-    large backdrop="false"
-  >
-    <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 row clearfix">
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">用户姓名</label>
-        <input type="text" class="input_search" v-model="order.f_user_name" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">联&ensp;系&ensp;人</label>
-        <input type="text" class="input_search" v-model="order.f_contact" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">联系电话</label>
-        <input type="text" class="input_search" v-model="order.f_phone" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">证件类型</label>
-        <input type="text" class="input_search" v-model="order.f_credentials" readonly>
-      </div>
-      <div class="form-group col-sm-8">
-        <label class="font_normal_body">证件号码</label>
-        <input type="text" class="input_search" v-model="order.f_idnumber" style="width: 85%" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">用户类型</label>
-        <input type="text" class="input_search" v-model="order.f_user_type" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">用户性质</label>
-        <input type="text" class="input_search" v-model="order.f_user_nature" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">户&emsp;&emsp;数</label>
-        <input type="text" class="input_search" v-model="order.f_apply_count" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">地址类型</label>
-        <input type="text" class="input_search" v-model="order.f_address_type" readonly>
-      </div>
-      <div class="form-group col-sm-8">
-        <label class="font_normal_body">详细地址</label>
-        <input type="text" class="input_search" v-model="order.f_address" style="width: 85%" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">处理状态</label>
-        <input type="text" class="input_search" v-model="order.f_orderstate" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">预约时间</label>
-        <input type="text" class="input_search" v-model="order.f_orderdate" readonly>
-      </div>
-      <div class="form-group col-sm-12">
-        <label class="font_normal_body">预约备注</label>
-        <input type="text" class="input_search" style="width: 90%" v-model="order.f_orderremark" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">审&ensp;核&ensp;人</label>
-        <input type="text" class="input_search" v-model="order.f_check_user" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">审核时间</label>
-        <input type="text" class="input_search" v-model="order.f_check_date" readonly>
-      </div>
-      <div class="form-group col-sm-12">
-        <label class="font_normal_body">审核备注</label>
-        <input type="text" class="input_search" style="width: 90%" v-model="order.f_check_remark" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">处&ensp;理&ensp;人</label>
-        <input type="text" class="input_search" v-model="order.f_process_user" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">处理时间</label>
-        <input type="text" class="input_search" v-model="order.f_process_date" readonly>
-      </div>
-      <div class="form-group col-sm-4">
-        <label class="font_normal_body">报建编号</label>
-        <input type="text" class="input_search" v-model="order.f_apply_num" readonly>
-      </div>
-
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-    </footer>
-  </modal>
-</template>
-<script>
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '预约报建',
-  data () {
-    return {
-      showtotal: false, // 控制详细信息显示
-      showData: true,
-      selectedData: null,
-      showCheck: false,
-      checkOptions: [
-        {
-          label: '是',
-          value: '是'
-        },
-        {
-          label: '否',
-          value: '否'
-        }
-      ],
-      check: null,
-      checkRemark: null,
-      showType: false,
-      applyType: null,
-      showModal: null,
-      apply: {},
-      showApply: false,
-      applyList: [],
-      checkApply: null,
-      order: null,
-      showView: false
-    }
-  },
-  created () {
-  },
-  methods: {
-    async mergeApply () {
-      let data = {
-        selectedData: this.selectedData,
-        checkApply: this.checkApply,
-        user: this.$login.f
-      }
-
-      let res = await this.$resetpost(
-        `rs/logic/mergeApply`,
-        data,
-        {resolveMsg: null,rejectMsg: '合并工程处理失败！！！'}
-      )
-
-      this.$refs.query.search()
-
-      this.$showMessage(`报建编号：${res.data.f_apply_num}`)
-    },
-    async mergeInitiate () {
-      let data = {
-        selectedData: this.selectedData,
-        apply: this.apply,
-        user: this.$login.f
-      }
-
-      let res = await this.$resetpost(
-        `rs/logic/mergeInitiate`,
-        data,
-        {resolveMsg: null,rejectMsg: '合并发起处理失败！！！'}
-      )
-
-      this.$refs.query.search()
-      console.log("返回的id：" + res.data.actid)
-      console.log("返回的f_process_id：" + res.data.f_process_id)
-      let f_process_id = res.data.f_process_id
-      let id = res.data.actid
-      if (f_process_id) {
-        let data = {
-          id: id,
-          f_process_id: f_process_id,
-          actorperson: 'R(销售客服部负责人)',
-          username: this.$login.f.name,
-          userid: this.$login.f.id
-        }
-        let res = await this.$resetpost(
-          `rs/logic/addActorperson`,
-          {data: data},
-          {resolveMsg: null,rejectMsg: '增加操作人失败！！！'}
-        )
-      }
-      this.$showMessage(`报建编号：${res.data.f_apply_num}`)
-    },
-    async applyinstall () {
-      let data = {
-        f_apply_type: this.applyType,
-        selectedData: this.selectedData,
-        user: this.$login.f
-      }
-
-      if (this.applyType === '散户报建') {
-        data.defname = '用户受理'
-        data.processname = '散户报建流程'
-      } else if (this.applyType === '工业户报建') {
-        data.defname = '用户受理'
-        data.processname = '工商户报建流程'
-      } else if (this.applyType === '商业户报建') {
-        data.defname = '用户受理'
-        data.processname = '工商户报建流程'
-      } else if (this.applyType === '散户集体报建') {
-        data.defname = '用户受理'
-        data.processname = '散户集体报建流程'
-      } else if (this.applyType === '开发商集体报建') {
-        data.defname = '用户受理'
-        data.processname = '开发商集体报建流程'
-      } else if (this.applyType === '煤改气报建') {
-        data.defname = '用户受理'
-        data.processname = '散户集体报建流程'
-      } else {
-        this.$showMessage('暂无此类报装')
-        return
-      }
-
-      let res = await this.$resetpost(
-        `rs/logic/initiateOrderApply`,
-        data,
-        {resolveMsg: null,rejectMsg: '预约单处理失败！！！'}
-      )
-
-      this.closeModal()
-
-      this.$showMessage(`共发起${res.data.total}条报建工程\n成功：${res.data.success}\n失败：${res.data.failure}`)
-    },
-    async checkOrder () {
-      let data = {
-        selectedData: this.selectedData,
-        check: this.check,
-        checkRemark: this.checkRemark,
-        user: this.$login.f,
-        f_orderstate: "待处理"
-      }
-
-      let res = await this.$resetpost(
-        `rs/logic/apply_third_upBidding`,
-        {data:data},
-        {resolveMsg: null,rejectMsg: '预约单审核处理失败！！！'}
-      )
-
-      this.$refs.query.search()
-
-      this.$showMessage(`审核通过！！！`)
-    },
-    closeModal () {
-      this.showCheck = false
-      this.showType = false
-      this.showModal = false
-      this.showApply = false
-      this.showView = false
-
-
-      this.check = null
-      this.checkRemark = null
-      this.applyType = null
-      this.apply = null
-      this.applyList = []
-      this.checkApply = []
-      this.order = []
-      this.selectedData = null
-      this.$refs.query.selectedData = []
-    },
-  },
-  events: {
-    'viewOrder' (row) {
-      this.order = row
-
-      this.showView = true
-    },
-    async 'handleOrder' (type, selectedData) {
-      this.selectedData = selectedData
-
-      if (type === '审核') {
-        this.showCheck = true
-      }
-      if (type === '批量发起') {
-        this.$showMessage('批量发起同一类型报建工程，建议所选预约单为同一类型、性质！！！', ['confirm']).then((res) => {
-          if (res === 'confirm') {
-            this.showType = true
-          }
-        })
-      }
-      if (type === '合并发起') {
-        this.apply = {
-          f_contact: this.selectedData[0].f_contact,
-          f_phone: this.selectedData[0].f_phone,
-          f_apply_count: this.selectedData.length
-        }
-        this.showModal = true
-      }
-      if (type === '合并工程') {
-        let data = {
-          tablename: 't_apply',
-          condition: `f_sub_state != '完工' and f_sub_state != '暂停' and f_sub_state != '终止' and f_apply_type = '散户集体报建' and f_orgid = ${this.$login.f.orgid}`
-        }
-        let res = await this.$resetpost(
-          'rs/sql/singleTable',
-          {data: data},
-          {resolveMsg: null, rejectMsg: '工程查询失败！！！'}
-        )
-
-        res.data.forEach(item => {
-          this.applyList.push({
-            'label': `${item.f_entry_name}`,
-            'value': item
-          })
-        })
-
-        this.showApply = true
-      }
-
-    },
-    'search' () {
-      this.closeModal()
-
-      // 关闭详细
-      this.showtotal = false
-      // 显示列表数据
-      this.showData = true
-      // 显示分页
-      this.$refs.query.$refs.cp.pager = true
-      // 调用查询
-      this.$refs.query.$refs.cp.$refs.cri.search()
-    }
-  },
-
-  watch: {
-  }
-}
-</script>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'">
+        <order-apply-list v-ref:query :show-data="showData"></order-apply-list>
+      </div>
+      <div v-if="showtotal" style="height: 89%">
+      </div>
+    </div>
+  </div>
+
+  <validator name="cv">
+    <modal
+      v-if="showCheck"
+      :show.sync="showCheck"
+      backdrop="false"
+    >
+      <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 col-sm-12" :class="[$cv.check.required ? 'has-error' : '']">
+          <label class="col-sm-3 control-label" style="line-height: 35px">是否合格：</label>
+          <div class="col-sm-9">
+            <input type="text" v-show="false" v-validate:check = "['required']" v-model="check">
+            <v-select
+              v-model="check"
+              :value.sync="check"
+              :options='checkOptions'
+              :value-single="true"
+              class="select select_list"
+              :search="false"
+              width="75%"
+              close-on-select ></v-select>
+          </div>
+        </div>
+<!--        <div class="form-group col-sm-12" :class="[$cv.remark.required ? 'has-error' : '']">-->
+<!--          <label class="col-sm-3 control-label" style="line-height: 60px">审核备注：</label>-->
+<!--          <div class="col-sm-9">-->
+<!--            <textarea-->
+<!--              class="form-control input_view" style="width: 75%;height: 100%"-->
+<!--              rows="2" v-validate:remark = "['required']" placeholder="审核不合格内容将通知用户"-->
+<!--              v-model="checkRemark" :value="checkRemark"-->
+<!--            >-->
+<!--            </textarea>-->
+<!--          </div>-->
+<!--        </div>-->
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" v-if="check == '是'" @click="checkOrder()" :disabled='!$cv.valid'>确认</button>
+      </footer>
+    </modal>
+  </validator>
+
+  <validator name="tv">
+    <modal
+      v-if="showType"
+      :show.sync="showType"
+      backdrop="false"
+    >
+      <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 col-sm-12" :class="[$tv.type.required ? 'has-error' : '']">
+          <label class="col-sm-3 control-label" style="line-height: 35px">报建类型：</label>
+          <div class="col-sm-9">
+            <input type="text" v-show="false" v-validate:type = "['required']" v-model="applyType">
+            <v-select
+              placeholder='请选择需要发起的工程类型'
+              v-model="applyType"
+              :value.sync="applyType"
+              :options='$appdata.getParam("报建类型")'
+              :value-single="true"
+              class="select select_list"
+              :search="false"
+              width="75%"
+              close-on-select ></v-select>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" @click="applyinstall()" :disabled='!$tv.valid'>确认</button>
+      </footer>
+    </modal>
+  </validator>
+
+  <validator name="mv">
+    <modal
+      v-if="showModal"
+      :show.sync="showModal"
+      backdrop="false"
+    >
+      <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>是否确定发起报建工程吗？</div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" @click="mergeInitiate()" :disabled='!$mv.valid'>确认</button>
+      </footer>
+    </modal>
+  </validator>
+
+  <validator name="av">
+    <modal
+      v-if="showApply"
+      :show.sync="showApply"
+      backdrop="false"
+    >
+      <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 col-sm-12" :class="[$av.apply.required ? 'has-error' : '']">
+          <label class="col-sm-3 control-label" style="line-height: 35px">选择工程：</label>
+          <div class="col-sm-9">
+            <input type="text" v-show="false" v-validate:apply = "['required']" v-model="checkApply.id">
+            <v-select
+              placeholder='请选择需要合并的工程'
+              v-model="checkApply"
+              :value.sync="checkApply"
+              :options='applyList'
+              :value-single="true"
+              class="select select_list"
+              :search="false"
+              width="75%"
+              close-on-select ></v-select>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" @click="mergeApply()" :disabled='!$av.valid'>确认</button>
+      </footer>
+    </modal>
+  </validator>
+
+  <modal
+    v-if="showView"
+    :show.sync="showView"
+    large backdrop="false"
+  >
+    <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 row clearfix">
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">用户姓名</label>
+        <input type="text" class="input_search" v-model="order.f_user_name" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">联&ensp;系&ensp;人</label>
+        <input type="text" class="input_search" v-model="order.f_contact" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">联系电话</label>
+        <input type="text" class="input_search" v-model="order.f_phone" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">证件类型</label>
+        <input type="text" class="input_search" v-model="order.f_credentials" readonly>
+      </div>
+      <div class="form-group col-sm-8">
+        <label class="font_normal_body">证件号码</label>
+        <input type="text" class="input_search" v-model="order.f_idnumber" style="width: 85%" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">用户类型</label>
+        <input type="text" class="input_search" v-model="order.f_user_type" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">用户性质</label>
+        <input type="text" class="input_search" v-model="order.f_user_nature" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">户&emsp;&emsp;数</label>
+        <input type="text" class="input_search" v-model="order.f_apply_count" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">地址类型</label>
+        <input type="text" class="input_search" v-model="order.f_address_type" readonly>
+      </div>
+      <div class="form-group col-sm-8">
+        <label class="font_normal_body">详细地址</label>
+        <input type="text" class="input_search" v-model="order.f_address" style="width: 85%" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">处理状态</label>
+        <input type="text" class="input_search" v-model="order.f_orderstate" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">预约时间</label>
+        <input type="text" class="input_search" v-model="order.f_orderdate" readonly>
+      </div>
+      <div class="form-group col-sm-12">
+        <label class="font_normal_body">预约备注</label>
+        <input type="text" class="input_search" style="width: 90%" v-model="order.f_orderremark" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">审&ensp;核&ensp;人</label>
+        <input type="text" class="input_search" v-model="order.f_check_user" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">审核时间</label>
+        <input type="text" class="input_search" v-model="order.f_check_date" readonly>
+      </div>
+      <div class="form-group col-sm-12">
+        <label class="font_normal_body">审核备注</label>
+        <input type="text" class="input_search" style="width: 90%" v-model="order.f_check_remark" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">处&ensp;理&ensp;人</label>
+        <input type="text" class="input_search" v-model="order.f_process_user" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">处理时间</label>
+        <input type="text" class="input_search" v-model="order.f_process_date" readonly>
+      </div>
+      <div class="form-group col-sm-4">
+        <label class="font_normal_body">报建编号</label>
+        <input type="text" class="input_search" v-model="order.f_apply_num" readonly>
+      </div>
+
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+<script>
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '预约报建',
+  data () {
+    return {
+      showtotal: false, // 控制详细信息显示
+      showData: true,
+      selectedData: null,
+      showCheck: false,
+      checkOptions: [
+        {
+          label: '是',
+          value: '是'
+        },
+        {
+          label: '否',
+          value: '否'
+        }
+      ],
+      check: null,
+      checkRemark: null,
+      showType: false,
+      applyType: null,
+      showModal: null,
+      apply: {},
+      showApply: false,
+      applyList: [],
+      checkApply: null,
+      order: null,
+      showView: false
+    }
+  },
+  created () {
+  },
+  methods: {
+    async mergeApply () {
+      let data = {
+        selectedData: this.selectedData,
+        checkApply: this.checkApply,
+        user: this.$login.f
+      }
+
+      let res = await this.$resetpost(
+        `rs/logic/mergeApply`,
+        data,
+        {resolveMsg: null,rejectMsg: '合并工程处理失败！！！'}
+      )
+
+      this.$refs.query.search()
+
+      this.$showMessage(`报建编号：${res.data.f_apply_num}`)
+    },
+    async mergeInitiate () {
+      let data = {
+        selectedData: this.selectedData,
+        apply: this.apply,
+        user: this.$login.f
+      }
+
+      let res = await this.$resetpost(
+        `rs/logic/mergeInitiate`,
+        data,
+        {resolveMsg: null,rejectMsg: '合并发起处理失败！！！'}
+      )
+
+      this.$refs.query.search()
+      console.log("返回的id：" + res.data.actid)
+      console.log("返回的f_process_id：" + res.data.f_process_id)
+      let f_process_id = res.data.f_process_id
+      let id = res.data.actid
+      if (f_process_id) {
+        let data = {
+          id: id,
+          f_process_id: f_process_id,
+          actorperson: 'R(市场部负责人)',
+          username: this.$login.f.name,
+          userid: this.$login.f.id
+        }
+        let res = await this.$resetpost(
+          `rs/logic/addActorperson`,
+          {data: data},
+          {resolveMsg: null,rejectMsg: '增加操作人失败！！！'}
+        )
+      }
+      this.$showMessage(`报建编号：${res.data.f_apply_num}`)
+    },
+    async applyinstall () {
+      let data = {
+        f_apply_type: this.applyType,
+        selectedData: this.selectedData,
+        user: this.$login.f
+      }
+
+      if (this.applyType === '散户报建') {
+        data.defname = '用户受理'
+        data.processname = '散户报建流程'
+      } else if (this.applyType === '工业户报建') {
+        data.defname = '用户受理'
+        data.processname = '工商户报建流程'
+      } else if (this.applyType === '商业户报建') {
+        data.defname = '用户受理'
+        data.processname = '工商户报建流程'
+      } else if (this.applyType === '散户集体报建') {
+        data.defname = '用户受理'
+        data.processname = '散户集体报建流程'
+      } else if (this.applyType === '开发商集体报建') {
+        data.defname = '用户受理'
+        data.processname = '开发商集体报建流程'
+      } else if (this.applyType === '煤改气报建') {
+        data.defname = '用户受理'
+        data.processname = '散户集体报建流程'
+      } else {
+        this.$showMessage('暂无此类报装')
+        return
+      }
+
+      let res = await this.$resetpost(
+        `rs/logic/initiateOrderApply`,
+        data,
+        {resolveMsg: null,rejectMsg: '预约单处理失败！！！'}
+      )
+
+      this.closeModal()
+
+      this.$showMessage(`共发起${res.data.total}条报建工程\n成功：${res.data.success}\n失败：${res.data.failure}`)
+    },
+    async checkOrder () {
+      let data = {
+        selectedData: this.selectedData,
+        check: this.check,
+        checkRemark: this.checkRemark,
+        user: this.$login.f,
+        f_orderstate: "待处理"
+      }
+
+      let res = await this.$resetpost(
+        `rs/logic/apply_third_upBidding`,
+        {data:data},
+        {resolveMsg: null,rejectMsg: '预约单审核处理失败！！！'}
+      )
+
+      this.$refs.query.search()
+
+      this.$showMessage(`审核通过！！！`)
+    },
+    closeModal () {
+      this.showCheck = false
+      this.showType = false
+      this.showModal = false
+      this.showApply = false
+      this.showView = false
+
+
+      this.check = null
+      this.checkRemark = null
+      this.applyType = null
+      this.apply = null
+      this.applyList = []
+      this.checkApply = []
+      this.order = []
+      this.selectedData = null
+      this.$refs.query.selectedData = []
+    },
+  },
+  events: {
+    'viewOrder' (row) {
+      this.order = row
+
+      this.showView = true
+    },
+    async 'handleOrder' (type, selectedData) {
+      this.selectedData = selectedData
+
+      if (type === '审核') {
+        this.showCheck = true
+      }
+      if (type === '批量发起') {
+        this.$showMessage('批量发起同一类型报建工程，建议所选预约单为同一类型、性质！！！', ['confirm']).then((res) => {
+          if (res === 'confirm') {
+            this.showType = true
+          }
+        })
+      }
+      if (type === '合并发起') {
+        this.apply = {
+          f_contact: this.selectedData[0].f_contact,
+          f_phone: this.selectedData[0].f_phone,
+          f_apply_count: this.selectedData.length
+        }
+        this.showModal = true
+      }
+      if (type === '合并工程') {
+        let data = {
+          tablename: 't_apply',
+          condition: `f_sub_state != '完工' and f_sub_state != '暂停' and f_sub_state != '终止' and f_apply_type = '散户集体报建' and f_orgid = ${this.$login.f.orgid}`
+        }
+        let res = await this.$resetpost(
+          'rs/sql/singleTable',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '工程查询失败！！！'}
+        )
+
+        res.data.forEach(item => {
+          this.applyList.push({
+            'label': `${item.f_entry_name}`,
+            'value': item
+          })
+        })
+
+        this.showApply = true
+      }
+
+    },
+    'search' () {
+      this.closeModal()
+
+      // 关闭详细
+      this.showtotal = false
+      // 显示列表数据
+      this.showData = true
+      // 显示分页
+      this.$refs.query.$refs.cp.pager = true
+      // 调用查询
+      this.$refs.query.$refs.cp.$refs.cri.search()
+    }
+  },
+
+  watch: {
+  }
+}
+</script>

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

@@ -684,9 +684,8 @@
       },
       //  根据小区名称获取合同编号
       async getContractNumber() {
-        console.log("进来了没有1")
         if (this.selectdata.defname == '申请登记') {
-
+          console.log("获取合同编号")
           for (let i = 0; i < this.show_data.fields.length; i++) {
             // console.log("进来了没有2")
             // console.log("选择框的名称：" + this.show_data.fields[i].label + "---小区名称的长度：" + this.show_data.fields[i].value.length)
@@ -847,16 +846,149 @@
 
 
 
-      }
+      },
+      async stopApply () {
+        console.log('终止报建！！！！！')
+
+        if (this.show_data.defname === '报建受理') {
+          this.show_data.f_stop_reason = this.show_data.f_accept_result
+        }
+        if (this.show_data.defname === '现场勘察') {
+          this.show_data.f_stop_reason = this.show_data.f_project_describe
+        }
+        if(!this.show_data.f_stop_reason){
+          this.show_data.f_stop_reason = '终止'
+        }
+        let data = {
+          selectdata: this.show_data,
+          loginUser: this.$login.f,
+          model: {f_stop_remarks: this.show_data.f_stop_reason}
+        }
 
+        let res = await this.$resetpost(
+          `rs/logic/stopApply`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '终止报建失败！！！'}
+        )
+
+        this.$dispatch('selfsearch')
+
+      },
+      // 获取片区
+      async getPcd () {
+        let data = {
+          tablename: 't_pcd',
+          condition: `f_filialeid = '${this.$login.f.orgid}'`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/applysingleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '片区查询失败！！！'}
+        )
+
+        let pcd =  res.data.map(item => {
+          return {
+            label: item.f_pcd,
+            value: item.f_pcd
+          }
+        })
+        for (const item of this.show_data.fields) {
+          if (item.label === '片区') {
+            item.options = pcd
+          }
+        }
+      },
+      // 获取街道
+      async getStreet (){
+        let http = new HttpResetClass()
+        let condition = "f_filialeid = " + this.$login.f.orgid
+        let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
+        let street = res.data.queryStreet.map(item=>{
+          return {
+            label: item.f_street,
+            value: item.f_street
+          }
+        })
+        for (const item of this.show_data.fields) {
+          if (item.label === '街道') {
+            item.options = street
+          }
+        }
+      }
     },
     events: {
+      async 'updateArea' (index) {
+        if (this.show_data.fields[index].value === '新小区') {
+          console.log("测试小区",index)
+          for (const item of this.show_data.fields) {
+            if (item.label === '小区') {
+              item.value = ''
+              item.hidden = true
+            }
+            if (item.label === '小区名称') {
+              item.value = ''
+              item.hidden = false
+            }
+          }
+        } else {
+          for (const item of this.show_data.fields) {
+            if (item.label === '小区名称') {
+              item.value = ''
+              item.hidden = true
+            }
+            if (item.label === '小区') {
+              item.value = ''
+              item.hidden = false
+            }
+          }
+        }
+      },
+      'confirmBuildFiles'(index){
+        if (this.show_data.fields[index].value === '否') {
+            for (const item of this.show_data.buttons){
+              if (item.button_name === '提交') {
+                  item.disabled = true
+              }
+            }
+        }
+      },
+      'buildArea'(){
+        if(this.show_data.f_area_type === '新小区'){
+          // this.getPcd()
+          this.getStreet()
+          for (const item of this.show_data.fields) {
+            if (item.label === '县/区') {
+              item.required = true
+              item.hidden = false
+            }
+            if (item.label === '街道') {
+              item.required = true
+              item.hidden = false
+            }
+            if (item.label === '片区') {
+              item.required = true
+              item.hidden = false
+            }
+            if (item.label === '小区名称') {
+              item.required = true
+              item.hidden = false
+            }
+          }
+        }
+      },
       test(i, j){
         console.log('删除')
         console.log(i + '-----' +j)
       },
       // 获取view层button事件/
       async 'button'(model) {
+        //before事件
+        console.log("当前按钮",model.button)
+        if (model.button.before) {
+          await this[model.button.before]()
+        }
         // 点击重置按钮就重置数据
         if (model.button.button_name === '重置') {
           this.refurbish()
@@ -950,6 +1082,7 @@
           this.$refs.service_show.data.fields[index].label === '县/区' ||
           this.$refs.service_show.data.fields[index].label === '街道' ||
           this.$refs.service_show.data.fields[index].label === '小区' ||
+          this.$refs.service_show.data.fields[index].label === '小区名称' ||
           this.$refs.service_show.data.fields[index].label === '楼号' ||
           this.$refs.service_show.data.fields[index].label === '单元号' ||
           this.$refs.service_show.data.fields[index].label === '楼层' ||
@@ -967,7 +1100,7 @@
             if (this.$refs.service_show.data.fields[i].label === '街道' && this.$refs.service_show.data.fields[i].value) {
               address += this.$refs.service_show.data.fields[i].value
             }
-            if (this.$refs.service_show.data.fields[i].label === '小区' && this.$refs.service_show.data.fields[i].value) {
+            if ((this.$refs.service_show.data.fields[i].label === '小区名称' || this.$refs.service_show.data.fields[i].label === '小区') && this.$refs.service_show.data.fields[i].value) {
               address += this.$refs.service_show.data.fields[i].value
             }
             if (this.$refs.service_show.data.fields[i].label === '楼号' && this.$refs.service_show.data.fields[i].value) {

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

@@ -1497,10 +1497,14 @@
                 this.load();
                 this.closeFile();
                 let mm = '';
-                for(var i=0;i<res.data.msg.length;i++){
+                for(let i = 0; i < res.data.msg.length; i++){
                   mm+= `${res.data.msg[i].msg}`
                 }
-                let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm}`
+                let worry = '';
+                for(let j = 0; j < res.data.worry.length; j++){
+                  worry += `${res.data.worry[j].msg}`
+                }
+                let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm},提醒：${worry}`
                 if (res.data.code == 500) {
                   this.iswork=false;
                   msg = res.data.msg

package/src/components/product/ServiceView.vue

@@ -366,6 +366,9 @@
     created () {
       // 初始化数据
       this.initializtion()
+      if (this.data.readyEvent) {
+        this.$dispatch(this.data.readyEvent)
+      }
     },
     methods: {
       // 按钮模态框确定
@@ -399,6 +402,9 @@
         }
         buttondatas.button_name = button.button_name
         buttondatas.button_index = index
+        if (button.before){
+          buttondatas.before = button.before
+        }
         if (button.button_fields) {
           button.button_fields.forEach(item => {
             buttondatas.button_fields[item.field] = item.value
@@ -480,6 +486,10 @@
       check (index) {
         // 是否禁用按钮
         this.disableButton()
+        if (this.data.fields[index].onchange) {
+          console.log("当前onchange",this.data.fields[index].onchange)
+          this.$dispatch(this.data.fields[index].onchange, index)
+        }
 
         this.$dispatch('check', index)
         // 如果有错误信息提示走错误信息判断处理