apply-clients 5.0.36 → 5.0.37-2

package/src/components/phone/phoneselect.vue

@@ -0,0 +1,250 @@
+`<template>
+  <div>
+    <table class="table table-bordered">
+      <tr>
+        <td  class="col-md-3">
+          <label>区分修改添加;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='id'></input>
+        </td>
+      </tr>
+      <tr>
+        <td  class="col-md-3">
+          <label>报建流程id;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_process_id'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>值：是/否;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_is_modify'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>类型;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_type'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>修改后类型;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_new_type'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label >状态：开工/停工;可以不选择，停工不需要工作进度  必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_state'></input>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <label>修改后状态：开工/停工;必填:否</label>
+        </td>
+        <td>
+          <input type="text" class="input_search" placeholder='f_new_state'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label >管沟开挖;类型:int;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_excavation'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label >修改后管沟开挖;类型:int;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_new_excavation'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label >管道焊接;类型:int;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_welding'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label >修改后管道焊接;类型:int必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_new_welding'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label >管沟回填;类型:int;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_backfill'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label >修改后管沟回填;类型:int;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_new_backfill'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>室内安装;类型:int;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_install'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>修改后室内安装;类型:int;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_new_install'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>其他工作 必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_other'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>修改后其他工作;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_new_other'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>备注;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_remarks'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>修改后备注;必填:否</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_new_remarks'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>时间;当前时间;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_time'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>修改后时间;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_new_time'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>照片;JsonArray;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_image'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>修改后照片;JsonArray;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_new_image'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>修改原因;必填:修改时必填</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_reason'></input>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <button style="width: 100%" class="btn btn-info" @click="cx()">提交</button>
+        </td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+  import { HttpResetClass } from 'vue-client'
+  export default {
+    title:'日志修改页面',
+    data () {
+      return {
+        log_filling:[
+          {id:''}
+        ]
+      }
+    },
+    methods: {
+      cx(){
+        let http = new HttpResetClass()
+        http.load('POST', `rs/entity/t_log_filling`,
+          {"f_is_modify":"否",
+            "f_type":"A",
+            "f_excavation":"12",
+            "f_welding":"21",
+            "f_backfill":"21",
+            "f_install":"21",
+            "f_other":"测试",
+            "f_state":"开工",
+            "f_remarks":"暂无",
+            "f_image":[
+
+            ],
+            "f_time":"2020-12-25",
+            "f_process_id":"112d39fb-f12b-4d23-aa8b-16faaa4f2f7d"},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+          console.log(res)
+        })
+      }
+    },
+    ready () {
+
+    }
+  }
+</script>
+
+<style scoped>
+label{
+  font-size: 10px;
+}
+</style>
+`

package/src/components/phone/phoneselect2.vue

@@ -0,0 +1,112 @@
+`<template>
+  <div>
+    <table class="table table-bordered">
+      <tr>
+        <td class="col-md-3">
+          <label>工程流程id;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_process_id'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>类型;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_type'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>情况说明;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_explain'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>处理方式;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_handle'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>领导批示;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_ratify'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>备注信息;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_remarks'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>定位信息;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_gps'></input>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <label class="col-md-3">时间;类型:int;必填:是</label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_time'></input>
+        </td>
+      </tr>
+      <tr>
+        <td class="col-md-3">
+          <label>照片;JSON数组;必填:是 </label>
+        </td>
+        <td class="col-md-9">
+          <input type="text" class="input_search" placeholder='f_image'></input>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <button style="width: 100%" class="btn btn-info" @click="cx2()">提交</button>
+        </td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+
+  import {HttpResetClass} from "vue-client";
+
+  export default {
+    title:'日志修改页面',
+    methods: {
+      cx2(){
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/sql/singleTable',
+          { "tablename":"t_extra",
+            "condition":"f_process_id = '112d39fb-f12b-4d23-aa8b-16faaa4f2f7d'"},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+          console.log(res)
+        })
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+  label{
+    font-size: 10px;
+  }
+
+</style>
+`

package/src/components/product/Common/ApplyValidateBill.vue

@@ -13,6 +13,7 @@
 
     let http = new HttpResetClass()
     let param = {
+      f_process_id:self.data.f_process_id,
       f_bill_user: self.$login.f.name, // 票据使用人
       f_bill_type: self.data.f_bill_type, // 票据类型
       f_filialeids: self.$login.f.f_orgids, //所属分公司
@@ -37,17 +38,23 @@
       }
     },
     props: ['data','show'],
-    ready () {
-
+   async ready () {
+      /*debugger
       console.log(this.data.f_bill_type)
       if (this.data.f_bill_type) {
-        getCurrentBill(this)
+        await  getCurrentBill(this)
+        console.log('打印参数',this.data.f_process_id)
 
-      }
+      }*/
     },
     watch : {
-      'show' (val) {
-          getCurrentBill(this)
+      data:{
+        deep:true,
+        immediate:true,
+        async handler(){
+          console.log('1111155555')
+          await getCurrentBill(this)
+        }
       }
     }
   }

package/src/components/product/Common/PrintBill.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="auto form-horizontal" >
-    <modal :show.sync="show"  v-ref:modal large backdrop="false">
+    <modal  :show.sync="show" v-if="show"  v-ref:modal large backdrop="false">
       <header slot="modal-header" class="modal-header">
         <h3 style="color:black" class="modal-title" >{{billConfig.billtype}}</h3>
         <button type="button" class="close" @click="closebuyerinfo"><span>&times;</span></button>
@@ -11,8 +11,8 @@
 <!--        </div>-->
         <validator name='v'>
           <form class="form-horizontal  select-overspread">
-            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' v-if="bill.data">
-              {{{bill.data}}}
+            <div class="row" style="display: flex;justify-content: center;" id='normal-bill_xx' v-if="bill.data" v-html="bill.data">
+
             </div>
           </form>
         </validator>
@@ -24,7 +24,7 @@
           </div>
         </div>
         <button type="button" class="btn btn-success" @click='print()'>打印</button>
-        <report-print id='normal-bill' top='15mm' left='5mm'  width='90%'  height='70%' :notrepeat="false" :showbtn="false" v-ref:reportprint></report-print>
+        <report-print :id="'normal-bill_xx'" top='15mm' left='5mm'  width='90%'  height='70%' :notrepeat="false" :showbtn="false" v-ref:reportprint></report-print>
         <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
       </footer>
     </modal>
@@ -35,6 +35,7 @@
   import Vue from "vue";
 
   let getBillData = async function(self, val) {
+    debugger
     self.bill = new DataModel(self.billData.url, {reprint: "'正常'"})
     await self.bill.search(self.data.chargeid)
     // self.bill.condition=
@@ -50,11 +51,11 @@
         model: {
           f_using_number: null
         },
-        bill: {},
+        bill: {data:''},
         messShow: false
       }
     },
-    props: ['show', 'data', 'billData', 'billConfig','titleName'],
+    props: ['show', 'data', 'billData', 'billConfig','titleName','billDataantai'],
     ready () {
       console.log('打票！！！！！！！！！！！！！！！！！')