瀏覽代碼

标书系统

web100 2 年之前
父節點
當前提交
d946090d47

+ 43 - 27
src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -704,20 +704,12 @@ export default {
                 cellBtn: false,
                 editBtn: false,
                 delBtn: false,
-                menuWidth: 140,
+                menuWidth: 150,
                 column: [{
                     label: '名称',
                     prop: 'contrastName',
                     index: 1,
                 }, {
-                    label: '船公司',
-                    prop: 'shippingCompany',
-                    index: 2,
-                }, {
-                    label: '船名',
-                    prop: 'shipName',
-                    index: 3,
-                }, {
                     label: '箱型',
                     prop: 'boxType',
                     type: "select",
@@ -726,32 +718,61 @@ export default {
                         label: "dictValue",
                         value: "dictValue"
                     },
-                    index: 4,
+                    index: 2,
                 }, {
                     label: '运费',
                     prop: 'seaFreight',
+                    index: 3,
+                },{
+                    label: '船公司',
+                    prop: 'shippingCompany',
+                    index: 4,
+                }, {
+                    label: '目的港箱使天数',
+                    prop: 'objectiveHarborFee',
                     index: 5,
+                },{
+                    label: '船期',
+                    prop: 'shippingDate',
+                    index: 6,
+                }, {
+                    label: '主单/分单',
+                    prop: 'documentType',
+                    index: 7,
                 }, {
+                    label: '航程',
+                    prop: 'voyage',
+                    index: 8,
+                }, {
+                    label: '亏舱费用',
+                    prop: 'brokenStowageAmount',
+                    index: 9,
+                },{
                     label: '截单时间',
                     prop: 'cutOffTime',
-                    index: 6,
-                }, {
+                    index: 10,
+                },{
+                    label: '备注',
+                    prop: 'remark',
+                    cell: true,
+                    index: 11,
+                },{
                     label: '截港时间',
                     prop: 'harborInterceptionTime',
-                    index: 7,
+                    index: 12,
                 }, {
-                    label: '船期',
-                    prop: 'shippingDate',
-                    index: 8,
+                    label: '竞价排名',
+                    prop: 'ranking',
+                    index: 13,
                 }, {
                     label: '起运港箱使天数',
                     prop: 'departureHarborFee',
-                    index: 9,
-                }, {
-                    label: '目的港箱使天数',
-                    prop: 'objectiveHarborFee',
-                    index: 10,
+                    index: 14,
                 }, {
+                    label: '船名',
+                    prop: 'shipName',
+                    index: 15,
+                },  {
                     label: '状态',
                     prop: 'status',
                     type: 'select',
@@ -761,12 +782,7 @@ export default {
                         label: "dictValue",
                         value: "dictKey"
                     },
-                    index: 11,
-                }, {
-                    label: '备注',
-                    prop: 'remark',
-                    cell: true,
-                    index: 12,
+                    index: 16,
                 }]
             },
             form: {},

+ 20 - 2
src/views/bidingDocument/issueTender/index.vue

@@ -277,12 +277,30 @@ export default {
       }
       this.loading = true;
       selectInvoiceList(queryParams).then(res=>{
-        this.dataList = res.data.data.records
+        // this.dataList = res.data.data.records
+         // 过滤状态为 7 的数据
+        this.dataList = res.data.data.records.filter(item => item.status !== 7);
         this.page.total = res.data.data.total
+        // 自动删除状态为 7 的数据
+        this.dataList.forEach(item => {
+          if (item.status === 7) {
+            this.deleteItem(item);
+          }
+        });
       }).finally(() => {
         this.loading = false;
       })
-    }
+    },
+    deleteItem(item) {
+      removeDelegationList({ id: item.id }).then(res => {
+        // 删除成功的处理逻辑
+        // console.log(res);
+      }).catch(error => {
+        // 删除失败的处理逻辑
+        console.log(error);
+      });
+    },
+    
   }
 }
 </script>

+ 17 - 23
src/views/salesOrder/detailsPage.vue

@@ -317,21 +317,10 @@ export default {
             span: 4,
           },
           {
-            label: "税率",
-            prop: "exchangeRate",
-            type: "select",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=tax_rate",
-            span: 4,
-          },
-          {
-            label: "销售总数量",
-            prop: "storageQuantity",
+            label: "应收金额",
+            prop: "balanceAmount",
             disabled: true,
-            span: 4,
+            span: 8,
           },
           {
             label: "成本",
@@ -346,20 +335,25 @@ export default {
             span: 4,
           },
           {
-            label: "已收金额",
-            prop: "settlmentAmount",
-            disabled: true,
-            span: 8,
+            label: "税率",
+            prop: "exchangeRate",
+            type: "select",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=tax_rate",
+            span: 4,
           },
           {
-            label: "合同金额",
-            prop: "orderAmount",
+            label: "销售总数量",
+            prop: "storageQuantity",
             disabled: true,
-            span: 8,
+            span: 4,
           },
           {
-            label: "收金额",
-            prop: "balanceAmount",
+            label: "收金额",
+            prop: "settlmentAmount",
             disabled: true,
             span: 8,
           }

+ 2 - 2
vue.config.js

@@ -32,9 +32,9 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.0.106:1080',
+        target: 'http://192.168.8.108:1080',
         // 打包地址
-        target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {