apply-clients 3.2.50 → 3.2.53

package/src/components/app_apply/Supervisory/AppProcessSupervisory.vue

@@ -8,7 +8,7 @@
               <label  class="font text-left">项目名称：</label>
             </div>
             <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_entry_name condition="u.f_entry_name like '%{}%'" />
+              <input  class="search_input input-font" v-model=model.f_entry_name condition="CHARINDEX('{}',u.f_entry_name)>0 " />
             </div>
           </div>
           <div class="row app-row">

package/src/components/product/Apply/Supervisory/SupervisoryhCart.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="overflow: auto;background-color: #FFFFFF">
+    <div style="overflow: auto;background-color: #FFFFFF; height: 85%;">
       <div class="row" v-for="(i,row) in defnames">
         <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'" @click="getdefname(row)" >
           {{row.defname}}

package/src/components/product/Ledger/ContractManagement/PurchaseContract/PurchaseContractInformation.vue

@@ -171,6 +171,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>
@@ -179,7 +180,7 @@
                   <th style="white-space: nowrap;">不含税单价</th>
                   <th style="white-space: nowrap;" v-if="type !== 'add'">累计数量</th>
                   <th style="white-space: nowrap;" v-if="$parent.$parent.type !== 'view'">
-                    <button @click="$parent.$parent.showModal = !$parent.$parent.showModal" type="button" class="btn btn-info">
+                    <button @click="$parent.$parent.isshow()" type="button" class="btn btn-info">
                       <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                     </button>
                     <a href="/download/材料批量导入模板.xlsx" type="button" class="btn btn-info">模板下载</a>
@@ -198,6 +199,7 @@
               <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>
@@ -240,9 +242,13 @@
                   <td style="text-align: center;">{{row.f_facility_money}}</td>
                   <td style="text-align: center;" v-if="type !== 'add'">{{row.f_total}}</td>
                   <td style="text-align: center;" v-if="$parent.$parent.type !== 'view'">
+                    <button type="button"  name="button" class="btn btn-link" @click="$parent.$parent.openUpdate($index,row)">修改</button>
+                    <button type="button"   name="button" class="btn btn-link" @click="$parent.$parent.delete($index)">删除</button>
+                  </td>
+                <!--td style="text-align: center;" v-if="$parent.$parent.type !== 'view'">
                     <button type="button" v-if="!row.id" name="button" class="btn btn-link" @click="$parent.$parent.openUpdate($index,row)">修改</button>
                     <button type="button" v-if="!row.id" name="button" class="btn btn-link" @click="$parent.$parent.delete($index)">删除</button>
-                  </td>
+                  </td>-->
                 </tr>
               </template>
             </data-grid>
@@ -263,28 +269,48 @@
           <span class="modal-title"><font size="3">添加材料</font></span>
         </header>
         <article slot="modal-body" class="form-horizontal modal-body clearfix" v-if="contract.f_contract_category === '物料'">
+          <div class="col-sm-12 form-group" :class="[$mv.material.required ? 'has-error' : '']">
+            <label class="control-label col-sm-2">选择材料</label>
+            <div class="col-sm-9">
+              <input type="text" v-show="false" v-model="material.id" v-validate:material = "['required']" >
+              <input-select
+                class="select select_list"
+                :value.sync="material"
+                v-model="material"
+                :timeout="500"
+                @select-search="select_search"
+                :options="contractMaterial"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <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_qhmaterial_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">
-              <input class="form-control" type="text" v-validate:f_material_name = "['required']" v-model="material.f_material_name" :value="material.f_material_name"/>
+              <input class="form-control" type="text" v-validate:f_material_name = "['required']" v-model="material.f_material_name" :value="material.f_qhmaterial_name"/>
             </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 class="form-control" type="text" v-validate:f_material_model = "['required']" v-model="material.f_material_model" :value="material.f_qhmaterial_model"/>
             </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 class="form-control" type="text" v-validate:f_material_norm = "['required']" v-model="material.f_material_norm" :value="material.f_qhmaterial_norm"/>
             </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">
-              <input class="form-control" type="text" v-validate:f_unit = "['required']" v-model="material.f_unit" :value="material.f_unit"/>
+              <input class="form-control" type="text" v-validate:f_unit = "['required']" v-model="material.f_unit" :value="material.f_qhunit"/>
             </div>
           </div>
           <div class="col-sm-12 form-group" :class="[$mv.f_price.required ? 'has-error' : '']">
@@ -348,7 +374,7 @@
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
+  import {HttpResetClass, PagedList} from 'vue-client'
 import {getNowDate,isEmpty} from '../../../../Util'
 // Date格式化
 Date.prototype.Format = function (fmt) {
@@ -384,6 +410,7 @@ export default {
       showModal: false,
       material: {},
       getfield: {
+        'f_material_coding':'材料编码',
         'f_material_name': '材料名称',
         'f_material_model': '材料型号',
         'f_material_norm': '材料规格',
@@ -392,6 +419,7 @@ export default {
       },
       facility: {},
       index: null,
+      contractMaterial: [],
       showFile: false
     }
   },
@@ -402,6 +430,71 @@ export default {
 
   },
   methods: {
+    select_search(text){
+      debugger
+      console.log("----------------"+text)
+      debugger
+      if(text){
+        let pcdText=text=`and f_qhmaterial_coding like '${text}%'`
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data:{items:"*",tablename:"t_qinhua_material",condition:`f_qhmaterial_coding is not null  ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          console.log('请求发送完成！！！！！'+JSON.stringify(res))
+          this.contractMaterial=[]
+          if(res.data.length>0){
+            console.log("查出的值",res.data)
+
+            res.data.forEach((item)=>{
+              console.log("打印没存值前的内容",this.contractMaterial)
+              debugger
+              this.contractMaterial.push({
+                'label': `${item.f_qhmaterial_coding}--${item.f_qhmaterial_name}--${item.f_qhmaterial_model}--${item.f_qhmaterial_norm}--${item.f_qhunit}`,
+                'value': item
+              })
+            })
+          }
+        })
+      }else{
+        this.getContractMaterial()
+      }
+    },
+    changeMaterial () {
+      if (!isEmpty(this.material.id)) {
+        let flag = this.model.data.some(item => {
+          if (item.id === this.material.id) {
+            return true
+          }
+          return false
+        })
+        if (flag) {
+          this.$showAlert('该物料已经存在，如需再次添加，请进行修改操作！！！', 'warning', 3000)
+          this.closeModal()
+        }
+      }
+    },
+    async isshow(){
+      this.showModal=!this.showModal
+      await this.getContractMaterial()
+
+      this.showMaterial = true
+    },
+    async getContractMaterial () {
+      debugger
+      let data = {
+        condition: `1=1`
+      }
+
+      let res = await this.$resetpost(
+        `rs/sql/getQhMaterial`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '秦华物料查询失败！！！'}
+      )
+      debugger
+      res.data.forEach(item => {
+        this.contractMaterial.push({
+          'label': `${item.f_qhmaterial_coding}--${item.f_qhmaterial_name}--${item.f_qhmaterial_model}--${item.f_qhmaterial_norm}--${item.f_qhunit}`,
+          'value': item
+        })
+      })
+    },
     closeFile () {
       this.showFile = false
       // 将选的文件清空
@@ -452,6 +545,7 @@ export default {
       if (this.contract.f_contract_category === '物料') {
         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 &&
@@ -510,6 +604,7 @@ export default {
       this.material = {}
       this.facility = {}
       this.index = null
+      this.contractMaterial=[]
     },
     // 合同类别
     changeContractCategory () {
@@ -594,6 +689,8 @@ export default {
             this.closeFile()
             return
           }
+          item.material.f_price=parseFloat(item.material.f_price).toFixed(2)
+          item.material.f_noprice=parseFloat(item.material.f_noprice).toFixed(2)
           this.material = item.material
         }
         if (this.contract.f_contract_category === '设备') {

package/src/components/product/Ledger/FacilityManagement/FacilityInventory/FacilityInventoryInformation.vue

@@ -97,7 +97,7 @@
           <div class="col-sm-4 form-group item" v-if="type === 'lend' || type === 'return'" :class="[$v2.f_cea_number.required ? 'has-error' : '']">
             <label class="control-label-justify control-label col-sm-6">CEA号</label>
             <div class="col-sm-6">
-              <input-select
+<!--              <input-select
                 class="select select_list"
                 v-show="type === 'lend'"
                 :value.sync="cea"
@@ -108,6 +108,10 @@
                      readonly
                      v-show="type === 'return'" v-validate:f_cea_number = "['required']"
                      v-model="facility.lend.f_cea_number"
+                     :value.sync="cea.f_cea_number"/>-->
+              <input class="form-control input_view" type="text"
+                     :readonly="type === 'return'"
+                     v-model="facility.lend.f_cea_number"
                      :value.sync="cea.f_cea_number"/>
             </div>
           </div>
@@ -478,7 +482,7 @@ export default {
         return
       }
 
-      res.data.forEach(item => {
+     /* res.data.forEach(item => {
         this.ceaList.push({
           'label': item.f_cea_number,
           'value': {
@@ -487,7 +491,7 @@ export default {
             f_entry_name: item.f_entry_name
           }
         })
-      })
+      })*/
 
     },
     // 获取合同

package/src/components/product/Ledger/Function/InstallInfoSelect.vue

@@ -7,7 +7,7 @@
             <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_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="u.f_entry_name like '%{}%'" placeholder='项目名称'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="CHARINDEX('{}',u.f_entry_name)>0" placeholder='项目名称'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">工程编号：</label>

package/src/components/product/Ledger/MaterialManagement/DeliveryRecord/DeliveryRecordList.vue

@@ -111,6 +111,12 @@
                         condition="md.f_delivery_date <= '{}'">
             </datepicker>
           </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_material_coding"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="m.f_material_coding like '%{}%'">
+          </div>
         </div>
       </div>
     </criteria>
@@ -118,7 +124,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>
@@ -142,9 +148,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>
@@ -230,6 +236,7 @@ export default {
       }),
       criteriaShow: false,
       getfield: {
+        'f_material_coding': '材料编码',
         'f_material_name': '材料名称',
         'f_material_model': '材料型号',
         'f_material_norm': '材料规格',

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

@@ -67,6 +67,12 @@
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="c.f_supplier 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_material_coding"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="m.f_material_coding like '%{}%'">
+            </div>
           </div>
         </div>
       </criteria>
@@ -74,6 +80,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>
@@ -92,6 +99,9 @@
           <td :class="row.f_stock > 0 ? (row.iswarning === 'true' ? 'warning' : '') : 'danger'" style="text-align: center;" @click="$parent.$parent.$parent.view(row)">
             <nobr><font>{{$index+1}}</font></nobr>
           </td>
+          <td :class="row.f_stock > 0 ? (row.iswarning === 'true' ? 'warning' : '') : 'danger'" style="text-align: center;" @click="$parent.$parent.$parent.view(row)">
+            <nobr><font>{{row.f_material_coding}}</font></nobr>
+          </td>
           <td :class="row.f_stock > 0 ? (row.iswarning === 'true' ? 'warning' : '') : 'danger'" style="text-align: center;" @click="$parent.$parent.$parent.view(row)">
             <nobr><font>{{row.f_material_name}}</font></nobr>
           </td>
@@ -172,6 +182,7 @@ export default {
       }),
       criteriaShow: false,
       getfield: {
+        'f_material_coding': '材料编码',
         'f_material_name': '材料名称',
         'f_material_model': '材料型号',
         'f_material_norm': '材料规格',

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

@@ -69,6 +69,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>
@@ -87,6 +88,7 @@
               <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>
@@ -130,6 +132,12 @@
                 :valueSingle="true"></input-select>
             </div>
           </div>
+          <div class="col-sm-12 form-group">
+            <label class="control-label col-sm-2">材料编码</label>
+            <div class="col-sm-9">
+              <input class="form-control" type="text" :value="material.f_material_coding" readonly />
+            </div>
+          </div>
           <div class="col-sm-12 form-group">
             <label class="control-label col-sm-2">材料名称</label>
             <div class="col-sm-9">
@@ -323,7 +331,7 @@
         )
         res.data.forEach(item => {
           this.materialList.push({
-            'label': `${item.f_material_name}--${item.f_material_model}--${item.f_material_norm}--${item.f_unit}--${item.f_price}`,
+            'label': `${item.f_material_coding}--${item.f_material_name}--${item.f_material_model}--${item.f_material_norm}--${item.f_unit}--${item.f_price}`,
             'value': item
           })
         })

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

@@ -28,22 +28,25 @@
           <div class="col-sm-4 form-group item" :class="[$v.f_warehouse.required ? 'has-error' : '']">
             <label class="control-label-justify control-label col-sm-6">发料仓库</label>
             <div class="col-sm-6">
-              <input class="form-control input_view" style=""
-                     type="text"
-                     v-validate:f_warehouse = "['required']"
-                     v-model="model.f_warehouse"
-                     :value="model.f_warehouse"/>
+              <input-select
+                class="select select_list"
+                :value.sync="model.f_warehouse"
+                v-model="model.f_warehouse"
+                :options="issueWarehouse"
+                :valueSingle="true"
+              ></input-select>
             </div>
           </div>
           <div class="col-sm-4 form-group item" :class="[$v.f_picking_unit.required ? 'has-error' : '']">
             <label class="control-label-justify control-label col-sm-6">施工单位</label>
             <div class="col-sm-6">
-              <input-select    class="select select_list"
-                               :value.sync="model.outboundOrder"
-                               v-model="model.outboundOrder"
-                               :options="shigongdanwei"
+              <input    class="form-control input_view" style=""
+                        type="text"
+                            v-validate:f_picking_unit = "['required']"
+                            v-model="model.f_picking_unit"
+                             :value="cea.f_construction_team"
                                :valueSingle="true">
-              </input-select>
+              </input>
             </div>
           </div>
           <div class="col-sm-4 form-group item">
@@ -53,8 +56,10 @@
                 class="select select_list"
                 :value.sync="cea"
                 v-model="cea"
+                :timeout="500"
+                @select-search="select_search"
                 :options="ceaList"
-                :valueSingle="true"></input-select>
+                :valueSingle="true" ></input-select>
               <input class="form-control input_view" type="text"
                      v-show="false"
                      v-model="model.f_cea_number"
@@ -76,6 +81,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>
@@ -95,6 +101,7 @@
               <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>
@@ -102,7 +109,7 @@
                   <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_prepare_quantity}}</td>
-                  <td style="text-align: center;">{{row.f_price * row.f_prepare_quantity}}</td>
+                  <td style="text-align: center;">{{parseFloat(row.f_noprice * row.f_prepare_quantity).toFixed(2)}}</td>
                   <td style="text-align: center;">{{row.f_remarks}}</td>
                   <td style="text-align: center;">
                     <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.openUpdateMaterial($index,row)">修改</button>
@@ -139,6 +146,12 @@
                 :valueSingle="true"></input-select>
             </div>
           </div>
+          <div class="col-sm-12 form-group" :class="[$mv.material.required ? 'has-error' : '']">
+            <label class="control-label col-sm-2">材料编码</label>
+            <div class="col-sm-9">
+              <input class="form-control" type="text" :value="material.f_material_coding" readonly />
+            </div>
+          </div>
           <div class="col-sm-12 form-group" :class="[$mv.material.required ? 'has-error' : '']">
             <label class="control-label col-sm-2">材料名称</label>
             <div class="col-sm-9">
@@ -225,6 +238,7 @@ export default {
   title: '材料出库单',
   data () {
     return {
+      issueWarehouse:[{label: '全部', value: ''}, ...this.$appdata.getParam('材料发料仓库')],
       cailiaotype: [{label: '全部', value: ''}, ...this.$appdata.getParam('材料项目类型')],
       shigongdanwei:[{label:'全部',value:''},...this.$appdata.getParam('施工单位')],
       model: {
@@ -242,6 +256,33 @@ export default {
     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()
+      }
+    },
     addOutboundOrder () {
       this.$dispatch('addOutboundOrder', this.model)
     },
@@ -321,7 +362,7 @@ export default {
 
       res.data.forEach(item => {
         this.materialList.push({
-          'label': `${item.f_material_name}--${item.f_material_model}--${item.f_material_norm}--${item.f_unit}--${item.f_price}`,
+          'label': `${item.f_material_coding}--${item.f_material_name}--${item.f_material_model}--${item.f_material_norm}--${item.f_unit}--${item.f_price}`,
           'value': item
         })
       })
@@ -377,7 +418,8 @@ export default {
           'value': {
             id: item.id,
             f_cea_number: item.f_cea_number,
-            f_entry_name: item.f_entry_name
+            f_entry_name: item.f_entry_name,
+            f_construction_team:item.f_construction_team
           }
         })
       })

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

@@ -49,6 +49,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>
@@ -67,6 +68,7 @@
               <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>
@@ -110,6 +112,12 @@
                 :valueSingle="true"></input-select>
             </div>
           </div>
+          <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" readonly 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">
@@ -308,7 +316,7 @@ export default {
 
       res.data.forEach(item => {
         this.purchaseRecordsMaterial.push({
-          'label': `${item.f_material_name}--${item.f_material_model}--${item.f_material_norm}--${item.f_unit}--${item.f_price}`,
+          'label': `${item.f_material_coding}--${item.f_material_name}--${item.f_material_model}--${item.f_material_norm}--${item.f_unit}--${item.f_price}`,
           'value': item
         })
       })
@@ -316,7 +324,7 @@ export default {
     // 获取有效采购单
     async getPurchaseOrder () {
       let data = {
-        condition: `po.f_status = '有效'`,
+        condition: `po.f_status = '有效' and f_lump_sum != f_actual_money`,
         data: {
           orgid: this.$login.f.orgid
         }