apply-clients 3.4.55 → 3.4.56

package/build/dev-server.js

@@ -8,8 +8,8 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://117.33.181.102:8400/#'
-var applyinstall = 'http://117.33.181.102:8400/#'
+var ldap = 'http://219.138.226.181:8401/'
+var applyinstall = 'http://219.138.226.181:8401/'
 
 var proxyTable = {
   '/rs/logic/getSaleInitData': {

package/package.json

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

package/src/filiale/gehua/pc/buildOrderList.vue

@@ -171,7 +171,8 @@
           <h4 class="modal-title">打印预览</h4>
         </header>
         <article slot="modal-body" class="modal-body">
-          <print-build-order :selectdata="selectdata" :type="type" v-ref:print></print-build-order>
+          <print-build-order v-if="selectdata.f_apply_type!='团购报建'" :selectdata="selectdata" :type="type" v-ref:print></print-build-order>
+          <print-build-ordertg v-if="selectdata.f_apply_type =='团购报建'" :selectdata="selectdata" :type="type" v-ref:printtg></print-build-ordertg>
         </article>
         <footer slot="modal-footer" class="modal-footer">
           <button type="button" class="btn btn-primary" @click="print()">打印</button>
@@ -268,7 +269,11 @@ export default {
       return total <= 0? "0%" : Math.round((num / total) * 10000) / 100.0 + "%";
     },
     print () {
-      this.$refs.print.print()
+      if(this.selectdata.f_apply_type!='团购报建'){
+        this.$refs.print.print()
+      }else{
+        this.$refs.printtg.print()
+      }
     },
     colseModal () {
       this.showPrint = false

package/src/filiale/gehua/pc/printBuildOrder.vue

@@ -29,30 +29,6 @@
     }
   </style>
 
-  <div id="printBuildOrderTg" v-if="selectdata.f_apply_type=='团购报建'">
-    <modal  style="width: 100%">
-      <header slot="modal-header" class="modal-header">
-        <h2><span style="letter-spacing: 15px">施工安装通知单</span></h2>
-      </header>
-      <article slot="modal-body" class="modal-body"style="width: 100%">
-        <div >
-          <div id="print">
-            <br />
-            {{{ model.data }}}
-          </div>
-        </div>
-      </article>
-
-      <footer slot="modal-footer" class="modal-footer">
-        <print-element v-ref:print v-show="false" id='print' styleid='style2'
-                       top='10' left='60' width='100%' height='100%'>
-        </print-element>
-        <button type="button" class="btn btn-primary" @click="print()">打印</button>
-      </footer>
-
-    </modal>
-  </div>
-
   <div id="printBuildOrder" v-if="this.selectdata.f_apply_type=='散户报建' || this.selectdata.f_apply_type=='工商户报建'">
     <p style="letter-spacing:15px ;font-size: 15px;margin-left: 35%">施工队施工通知单</p>
     <p>
@@ -201,15 +177,7 @@ export default {
   this.day =year  + ' 年' + mouth + ' 月' + dateday +' 日'
   },
   methods: {
-    async loadName () {
-      let http = new HttpResetClass()
-      let response = await http.load('POST', 'rs/report/buildOrderGehua', {data:this.selectdata},{resolveMsg: null, rejectMsg: null})
-      this.model=response
-    },
     print () {
-      if(this.selectdata.f_apply_type=='团购报建'){
-        this.loadName()
-      }
       this.$refs.print.PrintTable()
     }
   },

package/src/filiale/gehua/pc/printBuildOrderTg.vue

@@ -0,0 +1,55 @@
+<template>
+  <div id="printi">
+    {{{ model.data }}}
+  </div>
+  <print-element v-ref:print v-show="false" id='printi' styleid='style1'
+                 top='10' left='60' width='100%' height='100%'>
+  </print-element>
+
+</template>
+
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '打印任务单',
+    props: {
+      selectdata: {
+        type: Object
+      }
+    },
+
+    data() {
+      return {
+        showQuery: false,
+        model: '',
+        showPrint: false,
+      }
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName() {
+        let http = new HttpResetClass()
+        let response = await http.load('POST', 'rs/report/buildOrderGehua', {data: this.selectdata}, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+        this.model = response
+        console.log('-------------', this.model)
+      },
+      print() {
+        this.loadName()
+        this.$refs.print.PrintTable()
+      }
+    },
+    ready() {
+      debugger
+      this.loadName()
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/gehua/pc.js

@@ -6,6 +6,7 @@ let specialComp = {
   'supervisory-service-control': (resolve) => { require(['./pc/SupervisoryServiceControl'], resolve) },
   'supervisory-control': (resolve) => { require(['./pc/SupervisoryControl'], resolve) },
   'build-order-list': (resolve) => { require(['./pc/buildOrderList'], resolve) },
-  'print-build-order': (resolve) => { require(['./pc/printBuildOrder'], resolve) }
+  'print-build-order': (resolve) => { require(['./pc/printBuildOrder'], resolve) },
+  'print-build-ordertg': (resolve) => { require(['./pc/printBuildOrderTg'], resolve) }
 }
 exports.specialComp = specialComp

package/src/main.js

@@ -9,7 +9,7 @@ import {material} from 'material-client'
 import apply from './apply'
 
 all()
-apply('')
+apply('gehua')
 ldap()
 sale()
 material()