bug3976,3978

src/views/component/reagent/reagentChange.vue

@@ -184,7 +184,7 @@ export default {
                     const data = JSON.parse(this.formData.zuJianShuJu)
                     this.spanLength = data[1] || 0
                 }
-                if (val.length && this.reagentData.length <= 0) {
+                if (val?.length && this.reagentData?.length <= 0) {
                     const arry = []
                     val.forEach(item => {
                         arry.push({ jyxm: item.jianCeXiangMu, nd: item.nongDu, ypbh: item.biaoBenHao, jsjcdjg: item.jiuJieGuo, xsjcdjg: item.xinJieGuo, pq: item.jieGuo, fhl: item.biaoZhun, sfxf: item.xiangFu, jl: item.jieLun, xdfw: item.zuiXiaoFanWei, xmfhl: item.xiangMuFuHeLv, sjcz: item.shiJiChaZhi, yxpq: item.yunXuPianYi })
@@ -315,6 +315,12 @@ export default {
                             el.jl = item.jl
                             el.xmfhl = item.xmfhl
                         }
+                        if (el.sjcz) {
+                            el.sjcz = (el.sjcz + '').replace('-', '')
+                        }
+                        if (el.pq) {
+                            el.pq = (el.pq + '').replace('-', '')
+                        }
                     })
                 })
                 this.reagentData = list

src/views/component/reagentReceive/reagentReceive.vue

@@ -20,7 +20,7 @@
                         <el-table-column label="预扣量" prop="withhold" />
                         <el-table-column label="数量" prop="shuLiang">
                             <template slot-scope="{row}">
-                                <el-input v-model="row.shuLiang" type="number" size="mini" :max="10" placeholder="请输入" @input="handleInput(row)" />
+                                <el-input v-model="row.shuLiang" type="number" size="mini" :max="10" placeholder="请输入" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/^0+/, '')" @input="handleInput(row)" />
                             </template>
                         </el-table-column>
                         <el-table-column label="单位" prop="danWei" />
@@ -131,7 +131,7 @@ export default {
         handleInput (row) {
             if (Number(row.shuLiang || 0) > (Number(row.kuCunLiang) - Number(row.withhold || 0))) {
                 row.shuLiang = ''
-                this.$message.error('领用数量不可大于库存量减去预扣数量')
+                this.$message.warning('领用数量不可大于库存量减去预扣数量')
             }
         },
         // 当前页码改变

src/views/component/stocktakeManage/stocktakeManage.vue

@@ -263,8 +263,10 @@ export default {
             }).then(res => {
                 const { data = [] } = res
                 const arry = []
+                const oldData = this.reagentBatchData?.length > 0 ? JSON.parse(JSON.stringify(this.reagentBatchData)) : []
                 data.forEach(item => {
-                    arry.push({ kuCunId: item.id_, shiJiMingCheng: item.ming_cheng_, bianMa: item.bian_ma, piHao: item.batch_num, leiBie: item.lei_bie_, guiGe: item.gui_ge_, danWei: item.dan_wei_, youXiaoQi: item.exp_date, shengChanShang: item.chang_jia_ + '/' + item.gong_ying_shang_, kuCunLiang: item.quantity || 0, panCunShuLiang: '', beiZhu: '', cunChuWeiZhi: item.position, shangYueJieCun: item.lastMonth || 0, benYueRuKu: item.currIn || 0, benYueChuKu: item.currOut || 0, benYueJieCun: item.currBalance || 0 })
+                    const temp = oldData.find(b => b.kuCunId == item.id_)
+                    arry.push(temp || { kuCunId: item.id_, shiJiMingCheng: item.ming_cheng_, bianMa: item.bian_ma, piHao: item.batch_num, leiBie: item.lei_bie_, guiGe: item.gui_ge_, danWei: item.dan_wei_, youXiaoQi: item.exp_date, shengChanShang: item.chang_jia_ + '/' + item.gong_ying_shang_, kuCunLiang: item.quantity || 0, panCunShuLiang: '', beiZhu: '', cunChuWeiZhi: item.position, shangYueJieCun: item.lastMonth || 0, benYueRuKu: item.currIn || 0, benYueChuKu: item.currOut || 0, benYueJieCun: item.currBalance || 0 })
                 })
                 this.reagentBatchData = arry
             }).catch(() => {