Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/assets

src/components/Materialman/InventoryBosun.vue

@@ -53,7 +53,7 @@
         <tbody>
           <tr v-for="(item,index) in tableData" :key="index">
             <td>
-              <input class="color-input-red" type="checkbox" :disabled="item.DealStatus!=2" v-model="checkList"  :value="item" @change="selectionChange">
+              <input class="color-input-red" type="checkbox" v-if="item.DealStatus!=1" v-model="checkList"  :value="item" @change="selectionChange">
             </td>
             <td>
               <span class="ColorSpan huangSpan" v-if="item.CheckStatus == 1">未</span>
@@ -73,7 +73,10 @@
             <td>
               <span style="color:red;">{{getNum(item)}}</span>
             </td>
-            <td><el-input type='text' class="w80" v-model="item.Unit_Money" @keyup.native="checkInteger(item,'Unit_Money')" /></td>
+            <td>
+              <el-input type='text' class="w80" v-if="item.DealStatus==2" v-model="item.Unit_Money" @keyup.native="checkInteger(item,'Unit_Money')" />
+              <span v-else>{{item.Unit_Money}}</span>
+            </td>
             <td style="width:300px;">{{item.Remark}}</td>
             <td>
               <div>{{item.CheckEmpName}}</div>
@@ -226,7 +229,8 @@
               SpecificationName:x.SpecificationList.toString(),
               CheckDetailId:x.Id,
               ReportLossNum: x.InventoryNum - x.RealityNum,  //盈/亏数
-              ReportLossPrice:(x.InventoryNum - x.RealityNum)*x.Unit_Money  //总价格（请先用盈/亏价 乘以 赢/亏数）
+              ReportLossPrice:(x.InventoryNum - x.RealityNum)*x.Unit_Money,  //总价格（请先用盈/亏价 乘以 赢/亏数）
+              Remark:x.Remark  //备注
             }
             this.saveMsg.DetailList.push(obj);
           })

src/components/Materialman/InventoryBoyi.vue

@@ -182,7 +182,8 @@
               SpecificationName:x.SpecificationList.toString(),
               CheckDetailId:x.Id,
               ReportLossNum: x.RealityNum - x.InventoryNum,  //盈/亏数
-              ReportLossPrice:(x.RealityNum - x.InventoryNum)*x.Unit_Money  //总价格（请先用盈/亏价 乘以 赢/亏数）
+              ReportLossPrice:(x.RealityNum - x.InventoryNum)*x.Unit_Money,  //总价格（请先用盈/亏价 乘以 赢/亏数）
+              Remark:x.Remark  //备注
             }
             this.saveMsg.DetailList.push(obj);
           })