apply-clients 3.2.48 → 3.2.51

package/src/components/product/Ledger/MaterialManagement/InventoryInformation/ReturnMaterial.vue

@@ -12,6 +12,8 @@
                 :value.sync="cea"
                 v-model="cea"
                 :options="ceaList"
+                :timeout="500"
+                @select-search="select_search"
                 :valueSingle="true"></input-select>
             </div>
           </div>
@@ -50,6 +52,7 @@
               <template partial='head'>
                 <tr>
                   <th style="white-space: nowrap;">序号</th>
+                  <th style="white-space: nowrap;">材料编码</th>
                   <th style="white-space: nowrap;">材料名称</th>
                   <th style="white-space: nowrap;">材料型号</th>
                   <th style="white-space: nowrap;">材料规格</th>
@@ -62,12 +65,14 @@
                     <button @click="$parent.$parent.showMaterial = !$parent.$parent.showMaterial" type="button" class="btn btn-info">
                       <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                     </button>
+                    <button @click="$parent.$parent.showFile = !$parent.$parent.showFile" type="button" class="btn btn-info">批量导入</button>
                   </th>
                 </tr>
               </template>
               <template partial='body'>
                 <tr>
                   <td style="text-align: center;">{{$index+1}}</td>
+                  <td style="text-align: center;">{{row.f_material_coding}}</td>
                   <td style="text-align: center;">{{row.f_material_name}}</td>
                   <td style="text-align: center;">{{row.f_material_model}}</td>
                   <td style="text-align: center;">{{row.f_material_norm}}</td>
@@ -98,6 +103,12 @@
           <span class="modal-title"><font size="3">添加材料</font></span>
         </header>
         <article slot="modal-body" class="form-horizontal modal-body clearfix">
+          <div class="col-sm-12 form-group" :class="[$mv.f_material_coding.required ? 'has-error' : '']">
+            <label class="control-label col-sm-2">材料编码</label>
+            <div class="col-sm-9">
+              <input class="form-control" type="text" v-validate:f_material_coding = "['required']" v-model="material.f_material_coding" :value="material.f_material_coding"/>
+            </div>
+          </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_material_name.required ? 'has-error' : '']">
             <label class="control-label col-sm-2">材料名称</label>
             <div class="col-sm-9">
@@ -161,6 +172,18 @@
       </modal>
     </validator>
 
+    <modal :show.sync="showFile" v-ref:modal backdrop="true" title="选择文件">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
+        <h4 class="modal-title">选择文件</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer"></footer>
+    </modal>
   </div>
 </template>
 
@@ -178,13 +201,41 @@ export default {
       ceaList: [],
       cea: {},
       showMaterial: false,
-      index: null
+      index: null,
+      showFile: false
     }
   },
   ready () {
     this.getCEAList()
   },
   methods: {
+    select_search(text){
+      debugger
+      console.log("----------------"+text)
+      debugger
+      if(text){
+        let pcdText=text=`and f_cea_number like '%${text}%'`
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data:{items:"*",tablename:"t_apply",condition:`f_cea_number is not null and f_sub_state != '完工' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          console.log('请求发送完成！！！！！'+JSON.stringify(res))
+          if(res.data.length>0){
+            res.data.forEach((item)=>{
+
+              this.ceaList.push({
+                'label': item.f_cea_number,
+                'value': {
+                  id: item.id,
+                  f_cea_number: item.f_cea_number,
+                  f_entry_name: item.f_entry_name,
+                  f_construction_team:item.f_construction_team
+                }
+              })
+            })
+          }
+        })
+      }else{
+        this.getCEAList()
+      }
+    },
     addReturnMaterialWarehousing () {
       this.$dispatch('addReturnMaterialWarehousing', this.model)
     },
@@ -245,9 +296,105 @@ export default {
         })
       })
 
-    }
+    },
+    closeFile () {
+      this.showFile = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+    },
+    saveOrUpdate (i) {
+        let flag = this.model.data.some(item => {
+          if (
+            item.f_material_coding === this.material.f_material_coding &&
+            item.f_material_name === this.material.f_material_name &&
+            item.f_material_norm === this.material.f_material_norm &&
+            item.f_material_model === this.material.f_material_model &&
+            item.f_price === this.material.f_price &&
+            item.f_noprice === this.material.f_noprice &&
+            item.f_unit === this.material.f_unit &&
+            item.f_quantity === this.material.f_quantity &&
+            item.f_remarks === this.material.f_remarks
+          ) {
+            return true
+          }
+          return false
+        })
+        if (flag) {
+          if (isEmpty(i)) {
+            this.$showAlert('该物料已经存在！！！', 'warning', 3000)
+          } else {
+            throw `第${i}行物料已经存在！！！`
+          }
+        } else {
+          if (isEmpty(this.index)) {
+            this.model.data.push(this.material)
+          } else {
+            this.model.data.splice(this.index, 1, this.material)
+          }
+        }
+    },
   },
   events: {
+    async 'onFileUpload'(file, result) {
+      let data = {
+        filepath: result.f_downloadpath
+      }
+      let res = await this.$resetpost(`rs/logic/importRefuelingWarehousingContent`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0)
+      let i = 1
+      for (const item of res.data) {
+        if (!item.material.f_material_name) {
+          this.$showAlert(`第${i}行数据材料名称不存在！！！`, 'warning', 3000)
+          this.closeFile()
+          return
+        }
+        if (!item.material.f_material_model) {
+          this.$showAlert(`第${i}行数据材料型号不存在！！！`, 'warning', 3000)
+          this.closeFile()
+          return
+        }
+        if (!item.material.f_material_norm) {
+          this.$showAlert(`第${i}行数据材料规格不存在！！！`, 'warning', 3000)
+          this.closeFile()
+          return
+        }
+        if (!item.material.f_price) {
+          this.$showAlert(`第${i}行数据含税单价不存在！！！`, 'warning', 3000)
+          this.closeFile()
+          return
+        }
+        if (!item.material.f_noprice) {
+          this.$showAlert(`第${i}行数据不含税单价不存在！！！`, 'warning', 3000)
+          this.closeFile()
+          return
+        }
+        if (!item.material.f_unit) {
+          this.$showAlert(`第${i}行数据单位不存在！！！`, 'warning', 3000)
+          this.closeFile()
+          return
+        }
+        if (!item.material.f_quantity) {
+          this.$showAlert(`第${i}行数据数量不存在！！！`, 'warning', 3000)
+          this.closeFile()
+          return
+        }
+        if (!item.material.f_remarks) {
+          this.$showAlert(`第${i}行数据备注不存在！！！`, 'warning', 3000)
+          this.closeFile()
+          return
+        }
+        this.material = item.material
+        try {
+          this.saveOrUpdate(i)
+        } catch (e) {
+          this.$showAlert(e, 'danger', 3000)
+          this.closeFile()
+          return
+        }
+        i++
+      }
+      this.$showAlert(`成功导入${i-1}条数据`, 'success', 3000)
+      this.closeFile()
+    }
   }
 }
 </script>

package/src/components/product/Ledger/MaterialManagement/OutboundOrder/OutboundOrderInformation.vue

@@ -120,10 +120,11 @@
             </div>
           </div>
           <div class="col-sm-12">
-            <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+            <data-grid :model="model" optional partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
               <template partial='head'>
                 <tr>
                   <th style="white-space: nowrap;">序号</th>
+                  <th style="white-space: nowrap;">材料编码</th>
                   <th style="white-space: nowrap;">材料名称</th>
                   <th style="white-space: nowrap;">材料型号</th>
                   <th style="white-space: nowrap;">材料规格</th>
@@ -140,13 +141,14 @@
               <template partial='body'>
                 <tr>
                   <td style="text-align: center;">{{$index+1}}</td>
+                  <td style="text-align: center;">{{row.f_material_coding}}</td>
                   <td style="text-align: center;">{{row.f_material_name}}</td>
                   <td style="text-align: center;">{{row.f_material_model}}</td>
                   <td style="text-align: center;">{{row.f_material_norm}}</td>
                   <td style="text-align: center;">{{row.f_unit}}</td>
                   <td style="text-align: center;">{{row.f_price}}</td>
                   <td style="text-align: center;">{{row.f_noprice}}</td>
-                  <td style="text-align: center;">{{row.f_money}}</td>
+                  <td style="text-align: center;">{{parseFloat(row.f_noprice * row.f_prepare_quantity).toFixed(2)}}</td>
                   <td style="text-align: center;">{{row.f_prepare_remarks}}</td>
                   <td style="text-align: center;">{{row.f_prepare_quantity}}</td>
                   <td style="text-align: center;">{{row.f_actual_quantity}}</td>
@@ -170,7 +172,7 @@
         <h4 class="modal-title">打印预览</h4>
       </header>
       <article slot="modal-body" class="modal-body clearfix">
-        <print-material-bill :outbound-order="outboundOrder" :material-prepare="model.data" v-ref:print></print-material-bill>
+        <print-material-bill :outbound-order="outboundOrder" :material-prepare="model.selectPrint" v-ref:print></print-material-bill>
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <button type="button" class="btn btn-primary" @click="print()">打印</button>
@@ -180,6 +182,7 @@
 </template>
 
 <script>
+  import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
 import {isEmpty} from '../../../../Util'
 export default {
@@ -188,7 +191,9 @@ export default {
   data () {
     return {
       model: {
-        data: []
+        rows: [],
+        selectPrint:[],
+        pageIndex:1
       },
       showPrint: false,
       ceaList: []
@@ -211,6 +216,13 @@ export default {
       this.showPrint = false
     },
     showPrintModal () {
+      debugger
+      this.model.selectPrint = this.$refs.grid.getRowData()
+      this.model.selectPrint.lumpsum= 0
+      for (var i=0;i<this.model.selectPrint.length;i++){
+        this.model.selectPrint.lumpsum =this.model.selectPrint.lumpsum + this.model.selectPrint[i].f_noprice * this.model.selectPrint[i].f_prepare_quantity
+      }
+      this.model.selectPrint.lumpsum=this.model.selectPrint.lumpsum.toFixed(2)
       this.showPrint = true
     },
     async getCEAList () {
@@ -248,7 +260,7 @@ export default {
         {resolveMsg: null, rejectMsg: '出库单查询失败！！！'}
       )
 
-      this.model.data = res.data
+      this.model.rows = res.data
     }
   },
   computed: {

package/src/components/product/Ledger/MaterialManagement/OutboundOrder/PrintMaterialBill.vue

@@ -2,7 +2,6 @@
   <style id="style">
     td{
       height: 30px;
-      width: 60px;
       padding: 0px;
       text-align: center;
     }
@@ -30,14 +29,14 @@
     <h4 style="margin: 0 0 5px 0">西安市天然气工程有限公司{{outboundOrder.f_entry_type}}项目材料领用单</h4>
     <p class="top">
       <span>编号：{{outboundOrder.f_ticket_number}}</span>
-      <span>此票有限期为三天过期作废</span>
+      <span>此票有限期为五天过期作废</span>
       <span>{{new Date(outboundOrder.f_billing_time).Format('yyyy年MM月dd日')}}</span>
     </p>
     <table border="1">
       <tr>
         <td>施工单位：</td>
         <td colspan="4">{{ outboundOrder.f_picking_unit }}</td>
-        <td colspan="2">CEA：{{ outboundOrder.f_cea_number }}</td>
+        <td colspan="3">CEA：{{ outboundOrder.f_cea_number }}</td>
         <td :rowspan="materialPrepare.length + 13" style="width: 10px">
           <p>白<br/>联<br/>库<br/>房</p>
 
@@ -52,9 +51,10 @@
         <td>工地名称：</td>
         <td colspan="4">{{ outboundOrder.f_picking_site }}</td>
         <td>发料仓库：</td>
-        <td>{{ outboundOrder.f_warehouse }}</td>
+        <td colspan="2">{{ outboundOrder.f_warehouse }}</td>
       </tr>
       <tr>
+        <td>材料编码</td>
         <td>材料名称</td>
         <td>材料型号</td>
         <td>单位</td>
@@ -64,13 +64,14 @@
         <td>备注</td>
       </tr>
       <tr v-for="item in materialPrepare">
+        <td>{{ item.f_material_coding }}</td>
         <td>{{ item.f_material_name }}</td>
         <td>{{ item.f_material_model }}</td>
         <td>{{ item.f_unit }}</td>
         <td>{{ item.f_prepare_quantity }}</td>
         <td>{{ item.f_noprice }}</td>
-        <td>{{ item.f_money }}</td>
-        <td>{{ item.f_remarks }}</td>
+        <td>{{ parseFloat(item.f_noprice * item.f_prepare_quantity).toFixed(2) }}</td>
+        <td>{{ item.f_prepare_remarks}}</td>
       </tr>
       <tr v-for="item in supplement">
         <td></td>
@@ -80,14 +81,15 @@
         <td></td>
         <td></td>
         <td></td>
+        <td></td>
       </tr>
       <tr>
         <td>合计：</td>
-        <td colspan="6">￥{{ outboundOrder.f_money }}</td>
+        <td colspan="7">￥{{ materialPrepare.lumpsum }}</td>
       </tr>
     </table>
     <p class="bottom">
-      <span>材料员：</span>
+      <span>主管：</span>
       <span>制单：{{ outboundOrder.f_operator }}</span>
       <span>发料：</span>
       <span>领料：</span>

package/src/components/product/Ledger/MaterialManagement/PurchaseRecords/PrintPurchaseOrder.vue

@@ -24,7 +24,7 @@
   </style>
   <div id="print">
     <img src="../../../../image/tubiao.png"style="width:150px; height:30px">
-    <h4 style="margin: 30px 0 5px 0">西安天然气工程有限责任公司材料采购订单</h4>
+    <h4 style="margin: 30px 0 5px 0">西安市天然气工程有限责任公司材料采购订单</h4>
     <p class="space-between">
       <span>部门：设备材料部</span>
       <span>申请人：{{ purchaseRecords.f_applicant }}</span>
@@ -37,18 +37,20 @@
     <table border="1">
       <tr>
         <td>序号</td>
+        <td>编码</td>
         <td>名称</td>
         <td>型号</td>
         <td>规格</td>
         <td>单位</td>
         <td>数量</td>
-        <td>不含税单价</td>
+        <td>含税单价</td>
         <td>金额</td>
         <td>库存</td>
         <td>备注</td>
       </tr>
       <tr v-for="item in material">
         <td>{{ $index+1 }}</td>
+        <td>{{ item.f_material_coding }}</td>
         <td>{{ item.f_material_name }}</td>
         <td>{{ item.f_material_model }}</td>
         <td>{{ item.f_material_norm }}</td>
@@ -56,7 +58,7 @@
         <td>{{ item.f_forecast_quantity }}</td>
         <td>{{ item.f_price }}</td>
         <td>{{ item.f_forecast_money }}</td>
-        <td>{{ item.f_stock }}</td>
+        <td>{{ item.totalstock }}</td>
         <td>{{ item.f_remarks }}</td>
       </tr>
       <tr v-for="item in supplement">
@@ -70,16 +72,18 @@
         <td></td>
         <td></td>
         <td></td>
+        <td></td>
       </tr>
       <tr>
-        <td colspan="10" style="text-align: left;padding-left: 10px">总金额（大写）：{{ smalltoBIG(purchaseRecords.f_lump_sum) }}</td>
+        <td colspan="10" style="text-align: left;padding-left: 10px">总金额（大写）：{{ smalltoBIG(material.lumpsum) }} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp; &nbsp; &nbsp;总金额（小写）： {{material.lumpsum}}元</td>
       </tr>
     </table>
-    <p class="space-between" style="padding: 10px 250px 10px 40px">
+    <p class="space-between">
       <span>需求日期：{{ purchaseRecords.f_demand_date }}</span>
       <span>合同状况：{{ purchaseRecords.f_contract_status }}</span>
+      <span>合同时间：{{ purchaseRecords.f_contract_time+"——"+purchaseRecords.f_contract_expiration_date }}</span>
     </p>
-    <p class="space-between" style="padding: 10px 250px 10px 40px">
+    <p class="space-between" style="padding: 10px 160px 10px 40px">
       <span>部门经理：</span>
       <span>分管副总：</span>
     </p>

package/src/components/product/Ledger/MaterialManagement/PurchaseRecords/PurchaseRecordsInformation.vue

@@ -94,11 +94,12 @@
         </div>
 
         <div class="col-sm-12">
-          <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+          <data-grid :model="model" optional partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
             <template partial='head'>
               <tr>
                 <th style="white-space: nowrap;">序号</th>
                 <th style="white-space: nowrap;">名称</th>
+                <th style="white-space: nowrap;">编码</th>
                 <th style="white-space: nowrap;">型号</th>
                 <th style="white-space: nowrap;">规格</th>
                 <th style="white-space: nowrap;">单位</th>
@@ -117,6 +118,7 @@
               <tr>
                 <td style="text-align: center;">{{$index+1}}</td>
                 <td style="text-align: center;">{{row.f_material_name}}</td>
+                <td style="text-align: center;">{{row.f_material_coding}}</td>
                 <td style="text-align: center;">{{row.f_material_model}}</td>
                 <td style="text-align: center;">{{row.f_material_norm}}</td>
                 <td style="text-align: center;">{{row.f_unit}}</td>
@@ -127,7 +129,7 @@
                 <td style="text-align: center;">{{row.f_quantity}}</td>
                 <td style="text-align: center;">{{row.f_forecast_quantity-row.f_quantity}}</td>
                 <td style="text-align: center;">{{row.f_actual_money}}</td>
-                <td style="text-align: center;">{{row.f_stock}}</td>
+                <td style="text-align: center;">{{row.totalstock}}</td>
                 <td style="text-align: center;">{{row.f_remarks}}</td>
               </tr>
             </template>
@@ -135,7 +137,7 @@
         </div>
 
         <div class="col-sm-12 form-group" style="text-align: center">
-          <button class="btn btn-primary" @click.prevent="showPrint = !showPrint">打印预览</button>
+          <button class="btn btn-primary" @click.prevent="showPrintModal()">打印预览</button>
         </div>
       </div>
     </form>
@@ -146,7 +148,7 @@
         <h4 class="modal-title">打印预览</h4>
       </header>
       <article slot="modal-body" class="modal-body clearfix">
-        <print-purchase-order :purchase-records="purchaseRecords" :material="model.data" v-ref:print></print-purchase-order>
+        <print-purchase-order :purchase-records="purchaseRecords" :material="model.selectPrint" v-ref:print></print-purchase-order>
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <button type="button" class="btn btn-primary" @click="print()">打印</button>
@@ -165,7 +167,9 @@ export default {
   data () {
     return {
       model: {
-        data: null
+        rows: null,
+        selectPrint:[],
+        pageIndex:1
       },
       showPrint: false
     }
@@ -174,22 +178,29 @@ export default {
     this.getPurchaseRecordsMaterial()
   },
   methods: {
+    async showPrintModal(){
+      this.model.selectPrint = this.$refs.grid.getRowData()
+      this.model.selectPrint.lumpsum= 0
+      for (var i=0;i<this.model.selectPrint.length;i++){
+        this.model.selectPrint.lumpsum =this.model.selectPrint.lumpsum + this.model.selectPrint[i].f_actual_money
+      }
+      this.model.selectPrint.lumpsum=this.model.selectPrint.lumpsum.toFixed(2)
+      this.showPrint = true
+    },
     print () {
       this.$refs.print.$refs.print.PrintTable()
     },
     async getPurchaseRecordsMaterial () {
       let data = {
-        tablename: 't_purchase_order_material',
         condition: `f_purchase_order_id = ${this.purchaseRecords.id}`
       }
-
       let res = await this.$resetpost(
-        `rs/sql/singleTable`,
+        `rs/sql/purchaseOrder`,
         {data: data},
         {resolveMsg: null, rejectMsg: '采购物料查询失败！！！'}
       )
 
-      this.model.data = res.data
+      this.model.rows = res.data
     }
   },
   computed: {

package/src/components/product/Ledger/MaterialManagement/PurchaseRecords/PurchaseRecordsList.vue

@@ -5,25 +5,13 @@
         <div class="row">
           <div class="form-group col-sm-3">
             <label class="font_normal_body">编&emsp;&emsp;号：</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_ticket_number"
-                   v-on:keyup.enter="$parent.$parent.search()" condition="o.f_ticket_number like '%{}%'" placeholder='编号'>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_order_number"
+                   v-on:keyup.enter="$parent.$parent.search()" condition="po.f_order_number like '%{}%'" placeholder='编号'>
           </div>
           <div class="form-group col-sm-3">
-            <label class="font_normal_body">C&ensp;E&ensp;A号：</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_cea_number"
-                   v-on:keyup.enter="$parent.$parent.search()" condition="o.f_cea_number like '%{}%'" placeholder='CEA号'>
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">单据类型：</label>
-            <v-select
-              v-model="model.f_type"
-              placeholder='请选择'
-              condition="o.f_type like '%{}%'"
-              :value.sync="model.f_type"
-              :options='$parent.$parent.orderList'
-              class="select select_list"
-              :value-single="true"
-              close-on-select ></v-select>
+            <label class="font_normal_body">合同编号：</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_contract_number"
+                   v-on:keyup.enter="$parent.$parent.search()" condition="c.f_contract_number like '%{}%'" placeholder='合同编号'>
           </div>
           <div class="form-group col-sm-3 button-range">
             <export-excel :data="$parent.$parent.getCondition"
@@ -43,46 +31,6 @@
           </div>
         </div>
         <div class="row" v-show="$parent.$parent.criteriaShow">
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">项目类型：</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_type"
-                   v-on:keyup.enter="$parent.$parent.search()" condition="o.f_entry_type like '%{}%'" placeholder='项目类型'>
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">发料仓库：</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_warehouse"
-                   v-on:keyup.enter="$parent.$parent.search()" condition="o.f_warehouse like '%{}%'" placeholder='发料仓库'>
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">施工单位：</label>
-            <input type="text" style="width: 60%" class="input_search" placeholder='施工单位' v-model="model.f_picking_unit"
-                   v-on:keyup.enter="$parent.$parent.search()"
-                   condition="o.f_picking_unit like '%{}%'">
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">工地名称：</label>
-            <input type="text" style="width: 60%" class="input_search" placeholder='工地名称' v-model="model.f_picking_site"
-                   v-on:keyup.enter="$parent.$parent.search()"
-                   condition="o.f_picking_site like '%{}%'">
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">操作人：</label>
-            <input type="text" style="width: 60%" class="input_search" placeholder='操作人' v-model="model.f_operator"
-                   v-on:keyup.enter="$parent.$parent.search()"
-                   condition="o.f_operator like '%{}%'">
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">状&emsp;&emsp;态：</label>
-            <v-select
-              v-model="model.f_outbound_status"
-              placeholder='请选择'
-              condition="{}"
-              :value.sync="model.f_outbound_status"
-              :options='$parent.$parent.OutboundStatus'
-              class="select select_list"
-              :value-single="true"
-              close-on-select ></v-select>
-          </div>
           <div class="form-group col-sm-3">
             <label  for="startDate" class="font_normal_body">开始时间：</label>
             <datepicker id="startDate" placeholder="开始日期"
@@ -91,7 +39,7 @@
                         :value.sync="model.startDate"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true"
-                        condition="o.f_billing_time >= '{}'">
+                        condition="op.f_invoicing_date >= '{}'">
             </datepicker>
           </div>
           <div class="form-group col-sm-3">
@@ -102,7 +50,7 @@
                         :value.sync="model.endDate"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true"
-                        condition="o.f_billing_time <= '{}'">
+                        condition="op.f_invoicing_date <= '{}'">
             </datepicker>
           </div>
         </div>
@@ -219,7 +167,9 @@ export default {
         'f_demand_date': '需求日期',
         'f_lump_sum': '开票金额',
         'f_actual_money': '实际金额',
-        'f_status': '状态'
+        'f_status': '状态',
+        'f_contract_time': '签订时间',
+        'f_contract_expiration_date': '到期时间'
       }
     }
   },

package/src/components/product/Ledger/MaterialManagement/WarehousingRecord/WarehousingRecordList.vue

@@ -112,7 +112,7 @@
       <template partial='head'>
         <tr>
           <th style="white-space: nowrap;">序号</th>
-<!--          <th style="white-space: nowrap;">物料编码</th>-->
+          <th style="white-space: nowrap;">物料编码</th>
           <th style="white-space: nowrap;">材料名称</th>
           <th style="white-space: nowrap;">材料型号</th>
           <th style="white-space: nowrap;">材料规格</th>
@@ -136,9 +136,9 @@
           <td style="text-align: center;">
             <nobr><font>{{$index+1}}</font></nobr>
           </td>
-<!--          <td style="text-align: center;">-->
-<!--            <nobr><font>{{row.f_material_coding}}</font></nobr>-->
-<!--          </td>-->
+          <td style="text-align: center;">
+            <nobr><font>{{row.f_material_coding}}</font></nobr>
+          </td>
           <td style="text-align: center;">
             <nobr><font>{{row.f_material_name}}</font></nobr>
           </td>

package/src/components/product/Ledger/Process/ProcessBusiness.vue

@@ -147,6 +147,14 @@
         this.$refs.query.$refs.cp.pager = true
         // 调用查询
         this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'comeback' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
       }
     },
     watch: {