apply-clients 3.2.41 → 3.2.50

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

@@ -52,7 +52,8 @@
                   <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>
                   <th style="white-space: nowrap;">单位</th>
                   <th style="white-space: nowrap;">数量</th>
                   <th style="white-space: nowrap;">备注</th>
@@ -70,6 +71,7 @@
                   <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_price}}</td>
+                  <td style="text-align: center;">{{row.f_noprice}}</td>
                   <td style="text-align: center;">{{row.f_unit}}</td>
                   <td style="text-align: center;">{{row.f_buy_quantity}}</td>
                   <td style="text-align: center;">{{row.f_remarks}}</td>
@@ -127,11 +129,17 @@
             </div>
           </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_price.required ? 'has-error' : '']">
-            <label class="control-label col-sm-2">单&emsp;&emsp;价</label>
+            <label class="control-label col-sm-2">含税单价</label>
             <div class="col-sm-9">
               <input class="form-control" type="number" readonly v-validate:f_price = "['required']" v-model="material.f_price" :value="material.f_price"/>
             </div>
           </div>
+          <div class="col-sm-12 form-group" :class="[$mv.f_noprice.required ? 'has-error' : '']">
+            <label class="control-label col-sm-2">不含税单价</label>
+            <div class="col-sm-9">
+              <input class="form-control" type="number" readonly v-validate:f_noprice = "['required']" v-model="material.f_noprice" :value="material.f_noprice"/>
+            </div>
+          </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_unit.required ? 'has-error' : '']">
             <label class="control-label col-sm-2">单&emsp;&emsp;位</label>
             <div class="col-sm-9">

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

@@ -98,7 +98,8 @@
                   <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>
                   <th style="white-space: nowrap;">金额</th>
                   <th style="white-space: nowrap;">库存</th>
                   <th style="white-space: nowrap;">备注</th>
@@ -118,6 +119,7 @@
                   <td style="text-align: center;">{{row.f_unit}}</td>
                   <td style="text-align: center;">{{row.f_forecast_quantity}}</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_forecast_money}}</td>
                   <td style="text-align: center;">{{row.f_stock}}</td>
                   <td style="text-align: center;">{{row.f_remarks}}</td>
@@ -175,11 +177,17 @@
             </div>
           </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_price.required ? 'has-error' : '']">
-            <label class="control-label col-sm-2">单&emsp;&emsp;价</label>
+            <label class="control-label col-sm-2">含税单价</label>
             <div class="col-sm-9">
               <input class="form-control" type="number" readonly v-validate:f_price = "['required']" v-model="material.f_price" :value="material.f_price"/>
             </div>
           </div>
+          <div class="col-sm-12 form-group" :class="[$mv.f_noprice.required ? 'has-error' : '']">
+            <label class="control-label col-sm-2">不含税单价</label>
+            <div class="col-sm-9">
+              <input class="form-control" type="number" readonly v-validate:f_noprice = "['required']" v-model="material.f_noprice" :value="material.f_noprice"/>
+            </div>
+          </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_unit.required ? 'has-error' : '']">
             <label class="control-label col-sm-2">单&emsp;&emsp;位</label>
             <div class="col-sm-9">

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

@@ -53,7 +53,8 @@
                   <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>
                   <th style="white-space: nowrap;">单位</th>
                   <th style="white-space: nowrap;">数量</th>
                   <th style="white-space: nowrap;">备注</th>
@@ -71,6 +72,7 @@
                   <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_price}}</td>
+                  <td style="text-align: center;">{{row.f_noprice}}</td>
                   <td style="text-align: center;">{{row.f_unit}}</td>
                   <td style="text-align: center;">{{row.f_quantity}}</td>
                   <td style="text-align: center;">{{row.f_remarks}}</td>
@@ -115,11 +117,17 @@
             </div>
           </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_price.required ? 'has-error' : '']">
-            <label class="control-label col-sm-2">单&emsp;&emsp;价</label>
+            <label class="control-label col-sm-2">含税单价</label>
             <div class="col-sm-9">
               <input class="form-control" type="number" v-validate:f_price = "['required']" v-model="material.f_price" :value="material.f_price"/>
             </div>
           </div>
+          <div class="col-sm-12 form-group" :class="[$mv.f_noprice.required ? 'has-error' : '']">
+            <label class="control-label col-sm-2">不含税单价</label>
+            <div class="col-sm-9">
+              <input class="form-control" type="number" v-validate:f_noprice = "['required']" v-model="material.f_noprice" :value="material.f_noprice"/>
+            </div>
+          </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_unit.required ? 'has-error' : '']">
             <label class="control-label col-sm-2">单&emsp;&emsp;位</label>
             <div class="col-sm-9">

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

@@ -128,7 +128,8 @@
                   <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>
                   <th style="white-space: nowrap;">金额</th>
                   <th style="white-space: nowrap;">备注</th>
                   <th style="white-space: nowrap;">预出库数量</th>
@@ -144,6 +145,7 @@
                   <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;">{{row.f_prepare_remarks}}</td>
                   <td style="text-align: center;">{{row.f_prepare_quantity}}</td>

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

@@ -26,6 +26,12 @@
               close-on-select ></v-select>
           </div>
           <div class="form-group col-sm-3 button-range">
+            <export-excel :data="$parent.$parent.getCondition"
+                          :field="$parent.$parent.getfield"
+                          sqlurl="rs/logic/exportfile"
+                          sql-name="getOutboundOrder"
+                          template-name='出库单记录'
+                          :choose-col="true"></export-excel>
             <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
             <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
             <div
@@ -155,7 +161,7 @@
             <nobr><font>{{row.f_expire_date}}</font></nobr>
           </td>
           <td style="text-align: center;" @click="$parent.$parent.$parent.view(row)">
-            <nobr><font>{{new Date() > new Date(row.f_expire_date) ? '失效' : '有效'}}</font></nobr>
+            <nobr><font>{{row.f_state}}</font></nobr>
           </td>
           <td style="text-align: center;" @click="$parent.$parent.$parent.view(row)">
             <nobr><font>{{row.f_money}}</font></nobr>
@@ -242,7 +248,22 @@ export default {
           'label': '借料单',
           'value': '借料单'
         }
-      ]
+      ],
+      getfield: {
+        'f_ticket_number': '编号',
+        'f_cea_number': 'CEA号',
+        'f_entry_type': '项目类型',
+        'f_warehouse': '发料仓库',
+        'f_picking_unit': '施工单位',
+        'f_picking_site': '工地名称',
+        'f_operator': '操作人',
+        'f_billing_time': '开票时间',
+        'f_expire_date': '过期时间',
+        'f_state': '状态',
+        'f_money': '金额',
+        'f_type': '单据类型',
+        'f_write_off': '是否核销'
+      }
     }
   },
   ready () {
@@ -267,6 +288,14 @@ export default {
     }
   },
   computed: {
+    getCondition() {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition,
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }
+    }
   }
 }
 </script>

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

@@ -59,7 +59,7 @@
         <td>材料型号</td>
         <td>单位</td>
         <td>数量</td>
-        <td>单价</td>
+        <td>不含税单价</td>
         <td>金额</td>
         <td>备注</td>
       </tr>
@@ -68,7 +68,7 @@
         <td>{{ item.f_material_model }}</td>
         <td>{{ item.f_unit }}</td>
         <td>{{ item.f_prepare_quantity }}</td>
-        <td>{{ item.f_price }}</td>
+        <td>{{ item.f_noprice }}</td>
         <td>{{ item.f_money }}</td>
         <td>{{ item.f_remarks }}</td>
       </tr>

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

@@ -23,7 +23,8 @@
     }
   </style>
   <div id="print">
-    <h4 style="margin: 0 0 5px 0">西安天然气工程有限责任公司材料采购订单</h4>
+    <img src="../../../../image/tubiao.png"style="width:150px; height:30px">
+    <h4 style="margin: 30px 0 5px 0">西安天然气工程有限责任公司材料采购订单</h4>
     <p class="space-between">
       <span>部门：设备材料部</span>
       <span>申请人：{{ purchaseRecords.f_applicant }}</span>
@@ -41,7 +42,7 @@
         <td>规格</td>
         <td>单位</td>
         <td>数量</td>
-        <td>单价</td>
+        <td>不含税单价</td>
         <td>金额</td>
         <td>库存</td>
         <td>备注</td>
@@ -74,11 +75,11 @@
         <td colspan="10" style="text-align: left;padding-left: 10px">总金额（大写）：{{ smalltoBIG(purchaseRecords.f_lump_sum) }}</td>
       </tr>
     </table>
-    <p class="space-between">
+    <p class="space-between" style="padding: 10px 250px 10px 40px">
       <span>需求日期：{{ purchaseRecords.f_demand_date }}</span>
       <span>合同状况：{{ purchaseRecords.f_contract_status }}</span>
     </p>
-    <p class="space-between" style="padding: 10px 70px 10px 40px">
+    <p class="space-between" style="padding: 10px 250px 10px 40px">
       <span>部门经理：</span>
       <span>分管副总：</span>
     </p>

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

@@ -102,10 +102,12 @@
                 <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>
                 <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>
                 <th style="white-space: nowrap;">备注</th>
@@ -119,9 +121,11 @@
                 <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_forecast_quantity}}</td>
                 <td style="text-align: center;">{{row.f_forecast_money}}</td>
                 <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.f_remarks}}</td>

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

@@ -26,6 +26,12 @@
               close-on-select ></v-select>
           </div>
           <div class="form-group col-sm-3 button-range">
+            <export-excel :data="$parent.$parent.getCondition"
+                          :field="$parent.$parent.getfield"
+                          sqlurl="rs/logic/exportfile"
+                          sql-name="getPurchaseOrder"
+                          template-name='采购记录'
+                          :choose-col="true"></export-excel>
             <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
             <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
             <div
@@ -195,38 +201,58 @@ Date.prototype.Format = function (fmt) {
 export default {
   title: '库存信息',
   props: ['showData'],
-  data () {
+  data() {
     return {
       model: new PagedList('rs/sql/getPurchaseOrder', 30, {
         data: {
           orgid: this.$login.f.orgid
         }
       }),
-      criteriaShow: false
+      criteriaShow: false,
+      getfield: {
+        'f_contract_number': '合同编号',
+        'f_supplier': '供货商',
+        'f_contract_status': '合同状态',
+        'f_order_number': '订单编号',
+        'f_applicant': '申请人',
+        'f_invoicing_date': '时间',
+        'f_demand_date': '需求日期',
+        'f_lump_sum': '开票金额',
+        'f_actual_money': '实际金额',
+        'f_status': '状态'
+      }
     }
   },
-  ready () {
+  ready() {
     // 调用查询
     this.search()
   },
   methods: {
-    invalidOrder (row) {
+    invalidOrder(row) {
       this.$dispatch('invalidOrder', row)
     },
-    view (row) {
+    view(row) {
       this.$dispatch('view', row)
     },
-    clear () {
+    clear() {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
         this.$refs.cp.$refs.cri.model[key] = null
       })
     },
     // 查询
-    search () {
+    search() {
       this.$dispatch('search')
     }
   },
   computed: {
+    getCondition() {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition,
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }
+    }
   }
 }
 </script>

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

@@ -19,6 +19,12 @@
                    v-on:keyup.enter="$parent.$parent.search()" condition="mw.f_cea_number like '%{}%'" placeholder='CEA号'>
           </div>
           <div class="form-group col-sm-3 button-range">
+            <export-excel :data="$parent.$parent.getCondition"
+                          :field="$parent.$parent.getfield"
+                          sqlurl="rs/logic/exportfile"
+                          sql-name="getMaterialWarehousing"
+                          template-name='入库记录'
+                          :choose-col="true"></export-excel>
             <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
             <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
             <div
@@ -54,11 +60,17 @@
                    condition="m.f_material_norm like '%{}%'">
           </div>
           <div class="form-group col-sm-3">
-            <label class="font_normal_body">单&emsp;&emsp;价：</label>
+            <label class="font_normal_body">含税单价：</label>
             <input type="text" class="input_search" style="width: 60%" placeholder='单价' v-model="model.f_price"
                    v-on:keyup.enter="$parent.$parent.search()"
                    condition="m.f_price = '{}'">
           </div>
+          <div class="form-group col-sm-3">
+            <label class="font_normal_body">不含税单价：</label>
+            <input type="text" class="input_search" style="width: 60%" placeholder='单价' v-model="model.f_noprice"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="m.f_noprice = '{}'">
+          </div>
           <div class="form-group col-sm-3">
             <label class="font_normal_body">单&emsp;&emsp;位：</label>
             <input type="text" class="input_search" style="width: 60%" placeholder='单位' v-model="model.f_unit"
@@ -104,7 +116,8 @@
           <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>
           <th style="white-space: nowrap;">单位</th>
           <th style="white-space: nowrap;">合同号</th>
           <th style="white-space: nowrap;">厂家</th>
@@ -138,6 +151,9 @@
           <td style="text-align: center;">
             <nobr><font>{{row.f_price}}</font></nobr>
           </td>
+          <td style="text-align: center;">
+            <nobr><font>{{row.f_noprice}}</font></nobr>
+          </td>
           <td style="text-align: center;">
             <nobr><font>{{row.f_unit}}</font></nobr>
           </td>
@@ -206,7 +222,25 @@ export default {
           orgid: this.$login.f.orgid
         }
       }),
-      criteriaShow: false
+      criteriaShow: false,
+      getfield: {
+        'f_material_name': '材料名称',
+        'f_material_model': '材料型号',
+        'f_material_norm': '材料规格',
+        'f_price': '含税单价',
+        'f_noprice': '不含税单价',
+        'f_unit': '单位',
+        'f_contract_number': '合同号',
+        'f_supplier': '厂家',
+        'f_warehousing_quantity': '入库数量',
+        'f_warehousing_surplus': '库存结余',
+        'f_prepare_quantity': '预出库数量',
+        'f_ticket_number': '入库票号',
+        'f_cea_number': 'CEA号',
+        'f_warehousing_date': '入库时间',
+        'f_warehousing_operator': '操作人',
+        'f_warehousing_remarks': '备注'
+      }
     }
   },
   ready () {
@@ -225,6 +259,14 @@ export default {
     }
   },
   computed: {
+    getCondition() {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition,
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }
+    }
   }
 }
 </script>

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

@@ -54,12 +54,10 @@
                 <v-select
                   v-model="model.f_project_type"
                   placeholder='工程类型'
-                  condition="u.f_project_type like '%{}%'"
+                  condition="u.f_project_type in {} "
                   :value.sync="model.f_project_type"
                   :options='$parent.$parent.projectTypes'
-                  class="select select_list"
-                  :value-single="true"
-                  close-on-select ></v-select>
+                  ></v-select>
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">办理环节：</label>
@@ -202,7 +200,7 @@
     data () {
       return {
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目类型')], // 所有报建类型
-        projectTypes: [{label: '全部', value: ''}],
+        projectTypes: [{label: '全部', value: ''},...this.$appdata.getParam('工程类型')],
         projectAreas: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目区域')], // 所有报建类型
         defnames: [{label: '全部', value: ''}], // 流程节点
         model: new PagedList('rs/sql/checkuser', 20, {

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

@@ -86,7 +86,7 @@
               item.value = null
             }
           }
-          if (item.default || item.default == 0) {
+          if ((item.default || item.default == 0) && item.type !== 'datepicker' ) {
             item.value = item.default
           }
           if (this.selectdata[item.field]) {
@@ -102,10 +102,10 @@
               item.value = 0
             }
           }
-
           // datepicker 没有值给当时值
           if (item.type === 'datepicker' && !item.value && item.default) {
-            item.value = new Date().Format('yyyy-MM-dd HH:mm:ss')
+
+            item.value = new Date().Format(item.format || 'yyyy-MM-dd HH:mm:ss')
           }
 
           // 如果配置类型为select,优先从参数列表获取options
@@ -457,11 +457,48 @@
       },
       // 失去焦点出触发事件
       async 'onchange'(index) {
+
+        if (this.show_data.defname === '编制合同') {
+          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==='室内设备费') {
+
+            let a1 = this.getLableValue('室外安装费')
+            let b1 = this.getLableValue('室外甲供材')
+            let c1=this.getLableValue('室外设备费')
+            let a2 = this.getLableValue('室内安装费')
+            let b2 = this.getLableValue('室内甲供材')
+            let c2=this.getLableValue('室内设备费')
+            if(this.show_data.f_project_type!='支线'&&this.show_data.f_project_type!='主体'){
+        this.setLabelValue('合同总造价', parseFloat(parseFloat(a1) + parseFloat(b1) + parseFloat(c1)+ parseFloat(a2)+ parseFloat(b2)+ parseFloat(c2)).toFixed(2))
+            this.setLabelValue('安装费总和',parseFloat(parseFloat(a1)+ parseFloat(a2)).toFixed(2))
+            }
+        console.log('----------------------------------------')
+        }
+          if(this.show_data.fields[index].label==='室外安装费'||  this.show_data.fields[index].label==='室外甲供材'|| this.show_data.fields[index].label==='室外设备费'){
+            let a1 = this.getLableValue('室外安装费')
+            let b1 = this.getLableValue('室外甲供材')
+            let c1=this.getLableValue('室外设备费')
+            if(this.show_data.f_project_type==='支线'||this.show_data.f_project_type==='主体') {
+                this.setLabelValue('室外税金', parseFloat(parseFloat(a1) * 0.03).toFixed(2))
+                this.setLabelValue('室外造价',  parseFloat(parseFloat(a1) + parseFloat(b1) + parseFloat(c1) + parseFloat(a1) * 0.03).toFixed(2))
+            }else{
+              this.setLabelValue('室外税金', parseFloat(parseFloat(parseFloat(a1) + parseFloat(b1) + parseFloat(c1)) * 0.03).toFixed(2))
+              this.setLabelValue('室外造价', parseFloat(parseFloat(a1) + parseFloat(b1) + parseFloat(c1)).toFixed(2))
+            }
+          }
+          if(this.show_data.fields[index].label==='室内安装费'||  this.show_data.fields[index].label==='室内甲供材'|| this.show_data.fields[index].label==='室内设备费'){
+            let a2 = this.getLableValue('室内安装费')
+            let b2 = this.getLableValue('室内甲供材')
+            let c2=this.getLableValue('室内设备费')
+            this.setLabelValue('室内税金', parseFloat(parseFloat(parseFloat(a2) + parseFloat(b2) +  parseFloat(c2)) * 0.03).toFixed(2))
+            this.setLabelValue('室内造价',parseFloat(parseFloat(a2) + parseFloat(b2) +  parseFloat(c2)).toFixed(2))
+          }
+
+        }
+
         console.log('失去焦点')
         if (
           this.show_data.fields[index].label === '合同编号' ||
-          this.show_data.fields[index].label === '工程编号' ||
-          this.show_data.fields[index].label === 'CEA号'
+          this.show_data.fields[index].label === '工程编号'
         ) {
           try {
             await this.checkDuplicate(index)

package/src/components/product/Ledger/QinhuaMaterial/PickingRecord/PickingInformation.vue

@@ -68,19 +68,37 @@
           <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">
-              <input class="form-control" type="text" v-validate:f_material_name = "['required']" v-model="material.f_material_name" :value="material.f_material_name" />
+              <input type="text" v-show="false" v-model="material.f_material_name" v-validate:f_material_name = "['required']" >
+              <input-select
+                class="select select_list"
+                :value.sync="material.f_material_name"
+                v-model="material.f_material_name"
+                :options="f_material_name"
+                :valueSingle="true"></input-select>
             </div>
           </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_material_model.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_model = "['required']" v-model="material.f_material_model" :value="material.f_material_model" />
+              <input type="text" v-show="false" v-model="material.f_material_model" v-validate:f_material_model = "['required']" >
+              <input-select
+                class="select select_list"
+                :value.sync="material.f_material_model"
+                v-model="material.f_material_model"
+                :options="f_material_model"
+                :valueSingle="true"></input-select>
             </div>
           </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_material_norm.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_norm = "['required']" v-model="material.f_material_norm" :value="material.f_material_norm" />
+              <input type="text" v-show="false" v-model="material.f_material_norm" v-validate:f_material_norm = "['required']" >
+              <input-select
+                class="select select_list"
+                :value.sync="material.f_material_norm"
+                v-model="material.f_material_norm"
+                :options="f_material_norm"
+                :valueSingle="true"></input-select>
             </div>
           </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_unit.required ? 'has-error' : '']">
@@ -126,6 +144,9 @@ export default {
   title: '材料详细信息',
   data () {
     return {
+      f_material_name:[{label:'全部',value:''},... this.$appdata.getParam('秦华材料名称')],
+      f_material_model:[{label:'全部',value:''},... this.$appdata.getParam('秦华材料型号')],
+      f_material_norm:[{label:'全部',value:''},... this.$appdata.getParam('秦华材料规格')],
       ceaList: [],
       model: {
         data: []

package/src/components/product/Ledger/QinhuaMaterial/SeasoningRecord/SeasoningRecordList.vue

@@ -132,7 +132,12 @@
 
 <script>
 import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
+import * as morentime  from '../../../../Util'
+
+let readySomething = async function (self) {
+  self.$refs.cp.$refs.cri.model.startDate = self.data ? self.data.startDate : morentime.toStandardDateString() + ' 00:00:00'
+  self.$refs.cp.$refs.cri.model.endDate = self.data ? self.data.endDate : morentime.toStandardDateString() + ' 23:59:59'
+}
 // Date格式化
 Date.prototype.Format = function (fmt) {
   var o = {
@@ -150,6 +155,8 @@ Date.prototype.Format = function (fmt) {
   }
   return fmt
 }
+
+
 export default {
   title: '材料列表',
   props: ['showData'],
@@ -165,7 +172,12 @@ export default {
   },
   ready () {
     // 调用查询
-    this.search()
+    this.search(),
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
   },
   methods: {
     openSeasoningMaterial () {