|
|
@@ -403,8 +403,14 @@ export default {
|
|
|
// console.log('当前选择的位置ids：',locationIds)
|
|
|
var allLocal = `select * from t_ypcfwz where find_in_set(id_,'${localStr}')`
|
|
|
Promise.all([repostCurd("sql", allSQL), repostCurd("sql", allLocal)]).then((res) => {
|
|
|
- let result = res[0].variables.data
|
|
|
+ let initResult = res[0].variables.data
|
|
|
+ let result = []
|
|
|
let localInfo = res[1].variables.data
|
|
|
+ // 排序
|
|
|
+ ypInfoList.forEach(item=>{
|
|
|
+ result.push(initResult.find(i => i.yang_pin_bian_hao === item.yang_pin_bian_hao))
|
|
|
+ })
|
|
|
+
|
|
|
// console.log(localInfo)
|
|
|
/* 1、更新货架位置信息 */
|
|
|
this.emptyLocal = []
|
|
|
@@ -558,7 +564,7 @@ export default {
|
|
|
shi_fou_liu_yang_: ifLy,
|
|
|
liu_yang_ri_qi_: ifLy == '是'? ypInfoList[index].liu_yang_ri_qi_:'',
|
|
|
liu_yang_cun_fang: ifLy == '是'?lycf:'',
|
|
|
- liu_yang_shu_lian: lysl == null ?'':lysl,
|
|
|
+ liu_yang_shu_lian: ifLy == '是'? (lysl == null ?'':lysl) : '',
|
|
|
liu_yang_qi_xian: ifLy == '是'? ypInfoList[index].liu_yang_qi_xian:'',
|
|
|
xiao_hui_ri_qi_: ypInfoList[index].xiao_hui_ri_qi_=== undefined?'':ypInfoList[index].xiao_hui_ri_qi_,
|
|
|
fan_yang_ri_qi_: ypInfoList[index].fan_yang_ri_qi_=== undefined?'':ypInfoList[index].fan_yang_ri_qi_,
|
ZZJ