apply-clients 3.4.2-FuGu-20 → 3.4.2-FuGu-23

package/package.json

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

package/src/apply.js

@@ -68,7 +68,9 @@ export default function () {
   Vue.component('select-apply', (resolve) => { require(['./components/product/Process/Processes/selectApply'], resolve) })
   // 设备管理
   Vue.component('apply-devices-management', (resolve) => { require(['./components/product/Process/Processes/devicesManagement'], resolve) })
-
+  // 派工信息
+  Vue.component('apply-dispatchdetails', (resolve) => { require(['./components/product/Process/Processes/dispatchdetails'], resolve) })
+  Vue.component('apply-dispatch-list', (resolve) => { require(['./components/product/ApplyCharge/dispatchlist'], resolve) })
   /** VueUtils **/
   Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
   Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/HighMeter'], resolve) })

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

@@ -884,39 +884,30 @@ export default {
     },
     // 失去焦点出触发事件
     'onchange' (index) {
-      if (this.show_data.defname === '报装申请') {
+      if (this.show_data.defname === '申请登记' || (this.show_data.defname === '现场勘察' && this.show_data.f_apply_source === '微信公众号')) {
         if (
+          this.show_data.fields[index].label === '片区' ||
+          this.show_data.fields[index].label === '区/县' ||
           this.show_data.fields[index].label === '街道' ||
           this.show_data.fields[index].label === '小区' ||
-          this.show_data.fields[index].label === '楼号(乡/镇)' ||
-          this.show_data.fields[index].label === '单元(村)' ||
-          this.show_data.fields[index].label === '楼层(组)' ||
-          this.show_data.fields[index].label === '门牌号(号)'
+          this.show_data.fields[index].label === '楼号' ||
+          this.show_data.fields[index].label === '单元' ||
+          this.show_data.fields[index].label === '楼层' ||
+          this.show_data.fields[index].label === '门牌号'
         ) {
-
-          let f_street = this.getLableValue('街道')
-          let f_residential_area = this.getLableValue('小区')
-          let f_building = this.getLableValue('楼号(乡/镇)')
-          let f_building_suffix = f_building ? this.config.f_building_suffix : ''
-          let f_unit = this.getLableValue('单元(村)')
-          let f_unit_suffix = f_unit ? this.config.f_unit_suffix : ''
-          let f_floor = this.getLableValue('楼层(组)')
-          let f_floor_suffix = f_floor ? this.config.f_floor_suffix : ''
-          let f_room = this.getLableValue('门牌号(号)')
-          let f_room_suffix = f_room ? this.config.f_room_suffix : ''
-
-          let f_address = null
-
-          let f_address_type = this.show_data.f_address_type
-          if (f_address_type === '民用城区') {
-            f_address = f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
-          }
-          if (f_address_type === '民用农村') {
-            f_address = f_building + f_unit + f_floor + f_room
-          }
-          if (f_address_type === '特殊城区') {
-            f_address = f_street + f_residential_area
-          }
+          let f_pcd = this.getLableValue('区/县') || ''
+          let f_street = this.getLableValue('街道') || ''
+          let f_residential_area = this.getLableValue('小区') || ''
+          let f_building = this.getLableValue('楼号') || ''
+          let f_building_suffix = isEmpty(this.getLableValue('楼号')) ? '' : '号楼'
+          let f_unit = this.getLableValue('单元') || ''
+          let f_unit_suffix = isEmpty(this.getLableValue('单元')) ? '' : '单元'
+          let f_floor = this.getLableValue('楼层') || ''
+          let f_floor_suffix = isEmpty(this.getLableValue('楼层')) ? '' : '层'
+          let f_room = this.getLableValue('门牌号') || ''
+          let f_room_suffix = isEmpty(this.getLableValue('门牌号')) ? '' : '室'
+
+          let f_address = f_pcd + f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
           this.setLabelValue("地址", f_address)
         }
       }

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

@@ -140,12 +140,19 @@
           <div class="form-group row vertical-center">
             <label class="col-xs-4 control-label">安&ensp;装&ensp;人：</label>
             <div class="col-xs-8">
-              <input-select
-                class="select select_list"
-                :value.sync="item.f_install_person"
+              <input
+                class="form-control input_view"
+                :value.sync="installperson(item.f_install_person)"
                 v-model="item.f_install_person"
-                :options="installperson"
-                :valueSingle="true"></input-select>
+                placeholder="安装人"
+                readonly></input>
+<!--            <input-select-->
+<!--              class="select select_list"-->
+<!--              :value.sync="item.f_install_person"-->
+<!--              v-model="item.f_install_person"-->
+<!--              :options="installperson"-->
+<!--              :disable="mark === 1"-->
+<!--              :valueSingle="true"></input-select>-->
             </div>
           </div>
           <div class="form-group row vertical-center">
@@ -377,12 +384,18 @@ export default {
   computed: {
     // 安装人
     installperson() {
-      return Vue.user.f_installman.map(item => {
-        return {
-          label: item.name,
-          value: item.name
+      return function (f_install_person) {
+        if (isEmpty(f_install_person)) {
+          return Vue.user.name
         }
-      })
+        return f_install_person
+      }
+      // return Vue.user.f_installman.map(item => {
+      //   return {
+      //     label: item.name,
+      //     value: item.name
+      //   }
+      // })
     },
     // 表向
     aroundmeters() {

package/src/components/product/ApplyCharge/dispatchlist.vue

@@ -0,0 +1,136 @@
+<template>
+  <style id="printChargeStyle">
+    td {
+      height: 30px;
+      text-align: center;
+    }
+
+    table {
+      margin: auto;
+      /*width: 100%;*/
+      border-collapse: collapse;
+      border: 1px solid black;
+    }
+
+    h1, h2, h3, h4, h5, h6 {
+      text-align: center;
+    }
+
+    .orgs {
+      border-bottom: 2px solid;
+      padding: 5px;
+    }
+
+    .date {
+      float: left;
+      padding-left: 10px;
+    }
+
+    .status {
+      float: right;
+      padding-right: 10px;
+    }
+
+    .seal {
+      position: absolute;
+      right: 100px;
+      top: 120px;
+      width: 150px;
+      height: 150px;
+      /*opacity: 0.5;*/
+      z-index: -1;
+    }
+  </style>
+  <div id="printCharge">
+    <h4>
+      <span class="orgs">
+        {{ orgs }}燃气工程派工单
+      </span>
+    </h4>
+    <table border="1" width="100%">
+      <tr>
+        <td style="width: 10%">派单人</td>
+        <td style="width: 15%">{{ selectdata.f_user_name }}</td>
+        <td style="width: 10%">派单时间</td>
+        <td style="width: 20%">{{ new Date().Format('yyyy年MM月dd日') }}</td>
+        <td style="width: 20%">
+          商用 <input type="checkbox"  id="shang" value="商用" v-model="f_user_type" :disabled="false" >
+        </td>
+        <td style="width: 20%">
+          民用 <input type="checkbox"  id="min" value="民用" v-model="f_user_type" :disabled="false">
+        </td>
+      </tr>
+      <tr>
+        <td>施工地点</td>
+        <td colspan="5">{{ selectdata.f_address }}</td>
+      </tr>
+      <tr>
+        <td>现场联系人</td>
+        <td >{{ charge[0].f_contact }}</td>
+        <td>联系电话</td>
+        <td >{{ charge[0].f_phone }}</td>
+        <td>户数</td>
+        <td>{{ charge.households }}</td>
+      </tr>
+      <tr>
+        <td>工程内容</td>
+        <td colspan="6"></td>
+      </tr>
+      <tr>
+        <td>施工负责人</td>
+        <td colspan="2"></td>
+        <td>项目负责人</td>
+        <td colspan="2"></td>
+      </tr>
+    </table>
+    <img class="seal" border="0" :src="src" alt="">
+  </div>
+
+  <print-element v-show="false" v-ref:print id='printCharge' styleid='printChargeStyle'
+                 top='20' left='30' width='100%' height='100%'>
+  </print-element>
+</template>
+
+<script>
+import {isEmpty} from '../../Util'
+
+Date.prototype.Format = function (fmt) {
+  var o = {
+    "M+": this.getMonth() + 1, // 月份
+    "d+": this.getDate(), // 日
+    "H+": this.getHours(), // 小时
+    "m+": this.getMinutes(), // 分
+    "s+": this.getSeconds(), // 秒
+    "q+": Math.floor((this.getMonth() + 3) / 3), // 季度
+    "S": this.getMilliseconds() // 毫秒
+  }
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length))
+  for (var k in o)
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)))
+  return fmt
+}
+export default {
+  title: '打印派工单票据',
+  props: ['selectdata', 'charge'],
+  data () {
+    return {
+      f_user_type: [this.charge[0].f_user_type !== '民用' ? '商用' : '民用']
+    }
+  },
+  ready () {
+  },
+  methods: {},
+  computed: {
+    orgs () {
+      return this.$login.f.orgs
+    },
+    src () {
+      // return require(`./img/${this.$login.f.number}.png`)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,123 @@
+<template>
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <div _v-16a373b8="" class="col-sm-12 form-group" style="margin-bottom: 20px;">
+      <label _v-16a373b8="" class="control-label-justify control-label col-sm-3">派工单</label>
+        <button
+          type="button"
+          name="button"
+          class="button_search button_spacing"
+          @click="showPrintModal()"
+        >打印预览
+        </button>
+    </div>
+    <modal v-if="showPrint" :show.sync="showPrint" v-ref:modal :large="true" :backdrop="false" title="打印预览">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+        <h4 class="modal-title">打印预览</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <apply-dispatch-list :selectdata="selectdata" :charge="charge" v-ref:print></apply-dispatch-list>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" @click="print()">打印</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+import {getNowDate, isEmpty} from '../../../Util'
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '派工信息',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      showCharge: false,  // 派工明细
+      showPrint: false,   // 打印
+      model: {
+        data: null
+      },       // 记录
+      charge: {}
+    }
+  },
+  ready() {
+    this.search()
+  },
+  methods: {
+    print() {
+      this.$refs.print.$refs.print.PrintTable()
+    },
+    showPrintModal() {
+      this.charge = this.model.data
+      this.showPrint = true
+    },
+    async showChargeModal() {
+      this.getUserAddress()
+      if (this.selectdata.f_apply_type === '团购报建') {
+        this.charge.f_dev_info_id = this.selectdata.f_dev_id
+      }
+
+      this.showCharge = true
+    },
+    async search() {
+      let http = new HttpResetClass()
+      let data = {
+        f_process_id: this.selectdata.f_process_id
+      }
+      let res = await http.load('POST', 'rs/sql/getDispatchdetails', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: '派工信息查询失败！！！'
+      })
+      let roe = await http.load('POST', 'rs/sql/gethouseholds', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: '户数信息查询失败！！！'
+      })
+      this.model.data = res.data
+      this.model.data.households = roe.data[0].households
+    },
+    // 关闭对话框
+    closeModal() {
+      this.showCharge = false
+      this.showInvalid = false
+      this.showPrint = false
+      this.charge = {}
+      this.search()
+    }
+  },
+  events: {},
+  computed: {
+    paymentMethod() {
+      return this.$appdata.getParam("付款方式")
+    },
+    paymentTerm() {
+      return this.$appdata.getParam("收费项目")
+    }
+  },
+  watch: {}
+}
+</script>
+<style scoped>
+.textNoLineBreak {
+  white-space: nowrap;
+}
+
+.head-but {
+  margin-left: 5px;
+  height: 34px;
+  /*background-color: #6aa6e2;*/
+  border-radius: 4px;
+  font-family: PingFang;
+  color: #ffffff;
+}
+</style>