apply-clients 3.3.29 → 3.3.33

package/src/components/product/Process/Processes/Print/printBuildOrder.vue

@@ -0,0 +1,215 @@
+<template>
+  <style id="style">
+    td{
+      height: 30px;
+      width: 100px;
+      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;
+    }
+    .sign {
+      vertical-align: top;
+      padding: 10px;
+    }
+    .material {
+      text-align: left;
+      vertical-align: top;
+      padding: 10px;
+    }
+  </style>
+
+  <div style="margin-bottom: 20px" class="form-group select-overspread">
+    <label class="control-label-justify control-label col-sm-2">打印施工通知单</label>
+    <div class="col-sm-10" >
+      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute" @click="openModal()">打印</button>
+    </div>
+  </div>
+
+  <modal v-if="showModal" :show.sync="showModal" width="80%" title="打印预览" v-ref:modal large backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="colseModal()"><span>&times;</span></button>
+      <h4 class="modal-title">打印预览</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div id="print">
+        <h3><span style="letter-spacing: 15px">施工安装通知单</span></h3>
+        <table border="1">
+          <tr>
+            <td>用户姓名</td>
+            <td>{{ selectdata.f_user_name }}</td>
+            <td>报装编号</td>
+            <td>{{ selectdata.f_apply_num }}</td>
+            <td>电&emsp;&emsp;&emsp;&emsp;话</td>
+            <td>{{ selectdata.f_phone }}</td>
+          </tr>
+          <tr>
+            <td>用户地址</td>
+            <td colspan="3">{{ selectdata.f_address }}</td>
+            <td>施工安装时间</td>
+            <td>{{ selectdata.f_construction_date }}</td>
+          </tr>
+          <tr>
+            <td>安装项目</td>
+            <td>{{ selectdata.f_install_project }}</td>
+            <td>通知时间</td>
+            <td>{{ selectdata.sendtime }}</td>
+            <td>施工安装单位</td>
+            <td>{{ selectdata.f_construction_unit }}</td>
+          </tr>
+          <tr>
+            <td>表号</td>
+            <td colspan="2">{{ userfile.f_meternumber }}</td>
+            <td>表封号</td>
+            <td colspan="2">{{ userfile.f_metertitles }}</td>
+          </tr>
+          <tr>
+            <td colspan="6" class="material">
+              <p>施工安装情况</p>
+              <p v-for="item in selectdata.onetomany[0].rows" style="width: auto;display: inline-block">
+                {{$index + 1}}、{{item.f_material_name}}{{item.f_material_style}}&ensp;{{item.f_material_number}}{{item.f_material_unit}}&emsp;&emsp;
+              </p>
+            </td>
+          </tr>
+          <tr style="height: 100px">
+            <td colspan="2" class="sign">施工安装单位（签字）</td>
+            <td colspan="2" class="sign">工程验收（签字）</td>
+            <td colspan="2" class="sign">用户（签字）</td>
+          </tr>
+          <tr>
+            <td>备&emsp;&emsp;注</td>
+            <td colspan="5">{{ selectdata.f_construction_remarks }}</td>
+          </tr>
+        </table>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary" @click="print()">打印</button>
+    </footer>
+  </modal>
+
+
+  <print-element v-show="false" v-ref:print id='print' styleid='style'
+                 top='40' left='60' width='100%' height='100%'>
+  </print-element>
+
+</template>
+
+<script>
+import { isEmpty } from '../../../../Util'
+import {HttpResetClass} from "vue-client";
+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: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showModal: false,
+      userfile: null
+    }
+  },
+  ready () {
+  },
+  methods: {
+    colseModal () {
+      this.showModal = false
+      this.userfile = null
+    },
+    print () {
+      this.$refs.print.PrintTable()
+    },
+    openModal () {
+      this.getUserFiles()
+
+      this.showModal = true
+    },
+    async getUserFiles () {
+      let data = {
+        tablename: 't_userfiles',
+        condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '表具信息查询失败！！！'}
+      )
+
+      this.userfile = res.data[0]
+    },
+  },
+  computed: {
+    orgs () {
+      return this.$login.f.orgs
+    }
+  }
+}
+</script>
+
+<style scoped>
+.control-label-justify {
+  display: inline-block;
+  vertical-align: top;
+  width: 130px;
+  text-align: justify;
+  font-family: PingFang-SC-Bold;
+}
+
+.control-label-justify::after {
+  content: "";
+  display: inline-block;
+  width: 100%;
+  overflow: hidden;
+  height: 0;
+}
+</style>

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

@@ -106,7 +106,7 @@ export default {
     },
     mark: {
       type: Number,
-      default: 0        // 0：正常  1：禁用  2：追加用户
+      default: 0        // 0：正常  1：禁用
     }
   },
   data () {
@@ -155,11 +155,16 @@ export default {
   watch: {
     'model.count': {
       handler: function () {
-        for (let i = 0; i < this.selectdata.fields.length; i++) {
-          if (this.selectdata.fields[i].label === '户数') {
-            console.log(this.model.count)
-            this.selectdata.fields[i].value = this.model.count
-          }
+        if (this.model.count > this.selectdata.f_apply_count) {
+          this.selectdata.f_apply_count = this.model.count
+
+          this.$resetpost(
+            'rs/entity/t_apply',
+            this.selectdata,
+            {resolveMsg: null, rejectMsg: '数据更新失败！！！'}
+          ).then(res => {
+            this.$dispatch('breakControl', this.selectdata)
+          })
         }
       }
     }

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

@@ -195,7 +195,6 @@ export default {
                   item.options = temp
                 }
               }
-
             }
           }
         }
@@ -646,7 +645,7 @@ export default {
       let http = new HttpResetClass()
       let res = await http.load(
         'POST',
-        `rs/sql/getApplyMaterial`,
+        `rs/sql/getStockMaterial`,
         {data: data},
         {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
       )
@@ -1194,7 +1193,7 @@ export default {
         f_process_id : this.show_data.f_process_id,
         f_operator_id: this.$login.f.id,
         f_operator: this.$login.f.name,
-        f_operation_date: new Date(),
+        f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
         f_orgid: this.$login.f.orgid,
         f_orgname: this.$login.f.orgs
       }
@@ -1213,6 +1212,22 @@ export default {
 
       this.$dispatch('breakControl', this.show_data)
     },
+    async 'importEvent' (index, table, configName, filepath) {
+      let data = {
+        selectdata: this.show_data,
+        table: table,
+        filepath: filepath,
+        configName: configName,
+        user: this.$login.f
+      }
+
+      let res = await this.$resetpost(
+        `rs/logic/importEvent`,
+        data
+      )
+
+      this.$dispatch('breakControl', this.show_data)
+    },
     'onbutchange' (index) {
 
     },

package/src/components/product/ServiceView.vue

@@ -119,7 +119,7 @@
 
       <!-- onetomany -->
       <div class="" v-for="(index,item) in data.onetomany">
-        <onetomany :onetomany="item" :index="index" v-if="item.device === 'pc' || !item.device"></onetomany>
+        <onetomany :selectdata="data" :onetomany="item" :index="index" v-if="item.device === 'pc' || !item.device"></onetomany>
       </div>
 
       <div v-for="(i,item) in data.components">

package/src/components/product/Stop/StopApply.vue

@@ -1,103 +1,101 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div style="height: 95%">
-        <stop-apply-list v-ref:query></stop-apply-list>
-      </div>
-    </div>
-
-    <modal v-if="showModal" :show.sync="showModal" backdrop="false" large>
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
-        <span class="modal-title"><font size="3">撤销</font></span>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <div :class="data.f_cancel_reason ? '' : 'has-error'" class="form-group">
-          <label class="control-label-justify control-label col-sm-1">撤销原因</label>
-          <div class="col-sm-9">
-            <textarea
-              class="form-control input_view" style="width: 100%" rows="5"
-              v-model="data.f_cancel_reason" :value="data.f_cancel_reason"
-            ></textarea>
-          </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button :class="!data.f_cancel_reason ? 'btn btn-default':'btn btn-primary'"
-                :disabled="!data.f_cancel_reason" type="button" @click="confirmModal()">
-          确认
-        </button>
-      </footer>
-    </modal>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '终止报建',
-  data () {
-    return {
-      showModal: false,
-      data: null
-    }
-  },
-  ready () {
-  },
-  methods: {
-    closeModal () {
-      this.showModal = false
-      this.data = null
-
-      this.$refs.query.$refs.cp.$refs.cri.search()
-    },
-    async confirmModal () {
-      let data = {
-        data: this.data,
-        user: this.$login.f
-      }
-
-      let res = await this.$resetpost(
-        `rs/logic/cancelStopApply`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: '撤销失败！！！'}
-      )
-
-      this.closeModal()
-    }
-  },
-  events: {
-    'search' () {
-      this.$refs.query.$refs.cp.$refs.cri.search()
-    },
-    'cancelStopApply' (row) {
-      this.data = row
-
-      this.showModal = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .control-label-justify {
-    display: inline-block;
-    vertical-align: top;
-    width: 110px;
-    text-align: justify;
-    font-family: PingFang-SC-Bold;
-  }
-
-  .control-label-justify::after {
-    content: "";
-    display: inline-block;
-    width: 100%;
-    overflow: hidden;
-    height: 0;
-  }
-  .clearfix:after,.clearfix:before{
-    display: table;
-  }
-  .clearfix:after{
-    clear: both;
-  }
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <stop-apply-list v-ref:query></stop-apply-list>
+    </div>
+
+    <modal v-if="showModal" :show.sync="showModal" backdrop="false" large>
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
+        <span class="modal-title"><font size="3">撤销</font></span>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div :class="data.f_cancel_reason ? '' : 'has-error'" class="form-group">
+          <label class="control-label-justify control-label col-sm-1">撤销原因</label>
+          <div class="col-sm-9">
+            <textarea
+              class="form-control input_view" style="width: 100%" rows="5"
+              v-model="data.f_cancel_reason" :value="data.f_cancel_reason"
+            ></textarea>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button :class="!data.f_cancel_reason ? 'btn btn-default':'btn btn-primary'"
+                :disabled="!data.f_cancel_reason" type="button" @click="confirmModal()">
+          确认
+        </button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '终止报建',
+  data () {
+    return {
+      showModal: false,
+      data: null
+    }
+  },
+  ready () {
+  },
+  methods: {
+    closeModal () {
+      this.showModal = false
+      this.data = null
+
+      this.$refs.query.$refs.cp.$refs.cri.search()
+    },
+    async confirmModal () {
+      let data = {
+        data: this.data,
+        user: this.$login.f
+      }
+
+      let res = await this.$resetpost(
+        `rs/logic/cancelStopApply`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '撤销失败！！！'}
+      )
+
+      this.closeModal()
+    }
+  },
+  events: {
+    'search' () {
+      this.$refs.query.$refs.cp.$refs.cri.search()
+    },
+    'cancelStopApply' (row) {
+      this.data = row
+
+      this.showModal = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .control-label-justify {
+    display: inline-block;
+    vertical-align: top;
+    width: 110px;
+    text-align: justify;
+    font-family: PingFang-SC-Bold;
+  }
+
+  .control-label-justify::after {
+    content: "";
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    height: 0;
+  }
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+</style>