|
@@ -85,14 +85,14 @@
|
|
|
>
|
|
|
<!-- 推送状态 -->
|
|
|
<span slot="pushStatesSlot" slot-scope="text, record">
|
|
|
- <a-tag color="#2db7f5" v-if="record.pushStatus == '0'">未推送</a-tag>
|
|
|
+ <a-tag color="#2db7f5" v-if="record.pushStatus == '0' || record.pushStatus == null ">未推送</a-tag>
|
|
|
<a-tag color="#87d068" v-if="record.pushStatus == '1'">推送成功</a-tag>
|
|
|
<a-tag color="#f50" v-if="record.pushStatus == '2'">推送失败</a-tag>
|
|
|
</span>
|
|
|
|
|
|
<!-- 单据状态 -->
|
|
|
<span slot="statusSlot" slot-scope="text, record">
|
|
|
- <a-tag color="orange" v-if="record.status == '0'">未提交</a-tag>
|
|
|
+ <a-tag color="orange" v-if="record.status == '0' || record.status == null">未提交</a-tag>
|
|
|
<a-tag color="green" v-if="record.status == '1'">已提交</a-tag>
|
|
|
</span>
|
|
|
|
|
@@ -105,7 +105,7 @@
|
|
|
<a-dropdown>
|
|
|
<a class="ant-dropdown-link">更多<a-icon type="down"/></a>
|
|
|
<!-- 已保存 -->
|
|
|
- <a-menu slot="overlay" v-if="record.status == '0'">
|
|
|
+ <a-menu slot="overlay" v-if="record.status == '0' || record.status == null">
|
|
|
<a-menu-item>
|
|
|
<a @click="details(record)">详情</a>
|
|
|
</a-menu-item>
|
|
@@ -210,7 +210,7 @@ import addAdpackingDrawer from '@views/advance-packingList/addAdpackingDrawer.vu
|
|
|
import detailsAdpackingDrawer from '@views/advance-packingList/detailsAdpackingDrawer.vue'
|
|
|
import editAdpackingDrawer from '@views/advance-packingList/editAdpackingDrawer.vue'
|
|
|
|
|
|
-import { getadPaList } from '@api/document/advance-packingList.js'
|
|
|
+import { getadPaList, itemByMainId } from '@api/document/advance-packingList.js'
|
|
|
|
|
|
export default {
|
|
|
productName: 'AdPaListClothes', // 预装箱单-成衣
|
|
@@ -436,10 +436,21 @@ export default {
|
|
|
|
|
|
// 编辑
|
|
|
edit(record) {
|
|
|
- this.$refs.editAdpackingDrawer.visible = true
|
|
|
- // this.$refs.detailsAdpackingDrawer.visible = true
|
|
|
- this.$refs.editAdpackingDrawer.record = record //接口参数
|
|
|
- this.$refs.editAdpackingDrawer.getEditInfo()
|
|
|
+ console.log(record);
|
|
|
+ itemByMainId({id:record.id}).then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ console.log(res.result);
|
|
|
+ this.$refs.editAdpackingDrawer.addAdpacking = res.result; //接口参数
|
|
|
+ this.$refs.editAdpackingDrawer.visible = true;
|
|
|
+ // this.$refs.detailsAdpackingDrawer.visible = true
|
|
|
+
|
|
|
+ //this.$refs.editAdpackingDrawer.getEditInfo()
|
|
|
+ }else{
|
|
|
+ this.$message.error("获取记录详情失败");
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
},
|
|
|
// 详情
|
|
|
details(record) {
|