修改

src/components/empower/putinStorage.vue

@@ -73,6 +73,13 @@
                  <span>{{scope.row.StockInNum!=null?scope.row.StockInNum:0}}</span>
             </template>
         </el-table-column>
+         <el-table-column prop="" label="条码" width="250">
+           <template slot-scope="scope">
+             <el-input  v-model="scope.row.MaterialModel.Barcode"
+                        @input='getBarcode(scope.row,$event,scope.row,scope.$index)'
+                        placeholder="请输入"></el-input>
+           </template>
+         </el-table-column>
         <el-table-column prop="" label="入库数量" width="200">
             <template slot-scope="scope">
                 <el-input  v-model="scope.row.InStockNum" type="number" :min='0'
@@ -126,7 +133,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="" label="有效时间" width="200">
+          <el-table-column prop="" label="有效时间" >
             <template slot-scope="scope">
               <el-date-picker
                 v-model="scope.row.time"
@@ -240,6 +247,7 @@ export default {
             obj.GoodsId = x.MaterialModel.GoodsId;
             obj.SpecificationKey = x.MaterialModel.SpecificationKey;
             obj.InStockNum = x.InStockNum;
+            obj.Barcode = x.MaterialModel.Barcode;
             //2021-4-1加的日期列表
             zonglist.map((item,index)=>{
               if(x.Id == item.UniqueID ){
@@ -254,7 +262,8 @@ export default {
              this.Error('请输入入库数量');
              return
         }
-      this.rukuloading=true
+        console.log(msg)
+       this.rukuloading=true
        this.assetsApipost("/api/property/SetProcurementStockIn", msg, res => {
            this.rukuloading=false
            if (res.data.resultCode == 1) {
@@ -302,6 +311,9 @@ export default {
     handleSelectionChange(val,y){
       this.Warehousinglist[y].multipleSelection= val
     },
+    getBarcode(val,row,index){
+      console.log(val,row,index)
+    },
     setupTime(y){//全体设置
       if(this.Warehousinglist[y].multipleSelection.length==0){
         this.Error('请选择要设置的对象');

src/components/orderMan/orderList.vue

@@ -219,7 +219,7 @@
                         <div>
                           数量：x {{list.Number}}
                         </div>
-                        <el-tag v-if="list.IsApplyForAfterSale && list.IsApplyForAfterSale == 1"  size="small" type="danger">已退货退款</el-tag>
+                        <el-tag v-if="list.IsApplyForAfterSale && list.IsApplyForAfterSale == 2"  size="small" type="danger">已退货退款</el-tag>
                       </div>