1

src/components/empower/deliveryQuery.vue

@@ -87,7 +87,7 @@
         </div>
         <div class="searchInput" style="width:250px;margin-right: 10px;">
           <el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:225px;height:30px"
-                    placeholder="请输入订单id"
+                    placeholder="请输入订单ID"
                     v-model="msg.OrderId"
                     @clear="msg.pageIndex=1,getList()"
                     size="small"
@@ -109,16 +109,17 @@
       <el-table :data="dataList" border style="width: 100%;margin-Top:10px" v-loading="loading" @selection-change="handleSelectionChange">
         <el-table-column  type="selection" width="55" :selectable="checkSelectable"></el-table-column>
         <el-table-column prop="Id" label="ID" width="60"></el-table-column>
-        <el-table-column prop="MaterialId" label="耗材id" width="80"></el-table-column>
-        <el-table-column prop="GoodsName" label="商品名称" ></el-table-column>
-        <el-table-column prop="Specification" label="规格" width="160"></el-table-column>
+        <el-table-column prop="MaterialId" label="耗材ID" width="80"></el-table-column>
         <el-table-column prop="OrderNo" label="订单号" width="160"></el-table-column>
-        <el-table-column prop="CostMoney" label="成本金额" ></el-table-column>
+        <el-table-column prop="GoodsName" label="商品名称" width="200"></el-table-column>
+        <el-table-column prop="Specification" label="规格" width="160"></el-table-column>
+        <el-table-column prop="CostMoney" label="成本金额" width="80"></el-table-column>
         <el-table-column prop="ProductCode" label="货号" ></el-table-column>
         <el-table-column prop="WarehouseName" label="仓库名称" ></el-table-column>
-        <el-table-column prop="Number" label="数量" ></el-table-column>
+        <el-table-column prop="Number" label="数量" width="60"> </el-table-column>
         <el-table-column prop="StockOutDate" label="出库日期" ></el-table-column>
         <el-table-column prop="StockInDate" label="重新入库时间" ></el-table-column>
+        <el-table-column prop="FinanceId" label="财务单据" ></el-table-column>
         <el-table-column prop="StockInDate" label="重新入库数量" >
           <template slot-scope="scope">
             <el-input v-model="scope.row.InventoryNum" type="number"
@@ -209,7 +210,7 @@
         this.getList();
       },
       getList() {
-        let msg = this.msg
+        let msg = JSON.parse(JSON.stringify(this.msg))
         if(msg.OrderId!=''){
           msg.OrderId = Number(msg.OrderId)
         }else {
@@ -327,16 +328,19 @@
               this.Success(res.data.data.Msg);
 
               let show = false
-              this.selectList[index].list.map(x=>{//判读有没有重复的扫码
-                if(x.ValidityId == data.ValidityId){
-                  show=true;
+              if(data.ValidityId>0){
+                this.selectList[index].list.map(x=>{//判读有没有重复的扫码
+                  if(x.ValidityId == data.ValidityId){
+                    show=true;
+                    return
+                  }
+                })
+                if(show==true){
+                  this.Error('重复扫码')
                   return
                 }
-              })
-              if(show==true){
-                this.Error('重复扫码')
-                return
               }
+
               if(x.MaterialId == data.SuppliesId){//判断是否是同一个商品 规格
                 this.selectList[index].list.push(data)
               }else{