Browse Source

修改bug

Qukatie 11 months ago
parent
commit
b2e80a909f

+ 20 - 47
src/views/approveDataL/configuration/mainList.json

@@ -23,6 +23,7 @@
   "searchIndex": 2,
   "addBtn": false,
   "headerAlign": "center",
+  "columnBtn":false,
   "column": [
     {
       "label": "业务类型",
@@ -37,30 +38,14 @@
       },
       "dicData": [],
       "search": true,
-      "overHidden": true,
-      "index": 1
+      "overHidden": true
     },
     {
       "label": "业务类型",
       "prop": "checkType",
       "search": false,
       "overHidden": true,
-      "width": 100,
-      "index": 2
-    },
-    {
-      "label": "审核状态",
-      "prop": "auditStatus",
-      "type": "select",
-      "dicData": [],
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "search": true,
-      "searchValue": "S",
-      "overHidden": true,
-      "index": 3
+      "width": 100
     },
     {
       "label": "往来单位",
@@ -69,30 +54,26 @@
       "hide": true,
       "showColumn": false,
       "overHidden": true,
-      "width": 100,
-      "index": 4
+      "width": 100
     },
     {
       "label": "往来单位",
       "prop": "corpsName",
       "overHidden": true,
-      "width": 100,
-      "index": 5
+      "width": 100
     },
     {
       "label": "业务编号",
       "prop": "billNo",
       "search": true,
       "overHidden": true,
-      "width": 100,
-      "index": 6
+      "width": 100
     },
     {
       "label": "申请人",
       "prop": "sendUserId",
       "overHidden": true,
       "search": true,
-      "index": 7,
       "width": 100,
       "type": "select",
       "props": {
@@ -110,7 +91,6 @@
       "searchRange": true,
       "search": true,
       "overHidden": true,
-      "index": 8,
       "width": 150
     },
     {
@@ -122,7 +102,6 @@
       "unlinkPanels": true,
       "searchRange": true,
       "overHidden": true,
-      "index": 8,
       "width": 150
     },
     {
@@ -136,43 +115,37 @@
       "searchRange": true,
       "search": true,
       "overHidden": true,
-      "index": 8,
       "width": 150
     },
     {
       "label": "数量",
       "prop": "orderQuantity",
       "overHidden": true,
-      "width": 100,
-      "index": 9
+      "width": 100
     },
     {
       "label": "金额",
       "prop": "amount",
       "overHidden": true,
-      "width": 100,
-      "index": 10
-    },
-    {
-      "label": "应收金额",
-      "prop": "amountReceivable",
-      "overHidden": true,
-      "width": 100,
-      "index": 11
+      "width": 100
     },
     {
-      "label": "毛利",
-      "prop": "grossProfit",
-      "overHidden": true,
-      "width": 100,
-      "index": 11
+      "label": "审核状态",
+      "prop": "auditStatus",
+      "type": "select",
+      "dicData": [],
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "search": true,
+      "searchValue": "S",
+      "overHidden": true
     },
     {
       "label": "订单备注",
       "prop": "orderRemark",
-      "overHidden": true,
-      "width": 100,
-      "index": 12
+      "overHidden": true
     }
   ]
 }

+ 0 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1134,7 +1134,6 @@ export default {
                 }
             })
             newArr = [... new Set(corpArr)]
-            console.log(sumArr)
             newArr.forEach(e => {
                 let rmbD = 0
                 let rmbC = 0

+ 10 - 1
src/views/tirePartsMall/financingManagement/balanceRecharge/detailsPage.vue

@@ -235,7 +235,11 @@ export default {
     methods: {
         inEdit() {
             this.editButton = false
-            this.optionForm.disabled = false
+            if (this.form.status == 1) {
+                this.optionForm.disabled = true
+            } else {
+                this.optionForm.disabled = false
+            }
             this.isSave = false
         },
         dicChange(name, row) {
@@ -279,6 +283,11 @@ export default {
             })
             getDetails({ id: id }).then(res => {
                 this.form = res.data.data
+                if (res.data.data.status == 1) {
+                    this.optionForm.disabled = true
+                } else {
+                    this.optionForm.disabled = false
+                }
             }).finally(() => {
                 loading.close();
             })

+ 1 - 1
src/views/tirePartsMall/financingManagement/balanceRecharge/index.vue

@@ -7,7 +7,7 @@
         @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 405)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 405)" :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <el-button :size="size" :type="type" @click="$refs.crud.rowDel(row, index)">删除</el-button>
+          <el-button :size="size" :disabled="row.status==1" :type="type" @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建</el-button>

+ 30 - 20
src/views/tirePartsMall/financingManagement/financingManagement/detailsPage.vue

@@ -97,40 +97,50 @@ export default {
                     dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
                 },
                 {
-                    label: '融资金额',
-                    prop: "fundingAmount",
-                    disabled: true
-                },
-                {
-                    label: '在库融资金额',
-                    prop: "surplusFundingAmount",
-                    disabled: true
-                },
-                {
-                    label: '可用金额',
-                    prop: "availableAmount",
+                    label: '总金额',
+                    prop: "amount",
                     disabled: true
                 },
                 {
-                    label: "融资方",
-                    prop: "createDeptName",
+                    label: '保证金',
+                    prop: "bondAmount",
                     disabled: true
                 },
                 {
-                    label: '保证金',
-                    prop: "bondAmount",
+                    label: '融资金额',
+                    prop: "fundingAmount",
                     disabled: true
                 },
                 {
-                    label: '已缴保证金',
-                    prop: "paidAlreadyBondAmount",
+                    label: '配资比例',
+                    prop: "proportion",
                     disabled: true
                 },
+                // {
+                //     label: '在库融资金额',
+                //     prop: "surplusFundingAmount",
+                //     disabled: true
+                // },
+                // {
+                //     label: "融资方",
+                //     prop: "createDeptName",
+                //     disabled: true
+                // },
                 {
-                    label: '利息',
-                    prop: "interest",
+                    label: '可用金额',
+                    prop: "availableAmount",
                     disabled: true
                 },
+                // {
+                //     label: '已缴保证金',
+                //     prop: "paidAlreadyBondAmount",
+                //     disabled: true
+                // },
+                // {
+                //     label: '利息',
+                //     prop: "interest",
+                //     disabled: true
+                // },
                 {
                     label: '备注',
                     prop: "remarks",

+ 68 - 128
src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -527,32 +527,17 @@ export default {
                         message: " ",
                         trigger: "blur"
                     }]
-                }, {
-                    label: '仓库',
-                    prop: "storageId",
-                    type: 'select',
+                }, 
+                {
+                    label: '资金方',
+                    prop: "fundingPartyName",
                     disabled: false,
-                    // placeholder: '仓库为空即为异地销售',
-                    props: {
-                        label: 'cname',
-                        value: 'id'
-                    },
-                    dicUrl: '/api/blade-sales-part/storageDesc/listAll',
                     rules: [{
                         required: true,
                         message: " ",
                         trigger: "blur"
                     }]
                 },
-                // {
-                //     label: '来源单号',
-                //     prop: "srcOrdNo",
-                //     disabled: true
-                // }, {
-                //     label: '业务来源',
-                //     prop: "businessSource",
-                //     disabled: true
-                // },
                 {
                     label: '业务日期',
                     prop: "businesDate",
@@ -571,127 +556,54 @@ export default {
                     ]
                 },
                 {
-                    label: '联系人',
-                    type: "select",
-                    prop: "contacts",
-                    disabled: false,
-                    allowCreate: true,
-                    filterable: true,
-                    props: {
-                        label: 'address',
-                        value: 'id'
-                    },
-                    dicUrl: '/api/blade-sales-part/corpsAddr/corpIdByAddr?pid={{key}}'
-                }, {
-                    label: '电话',
-                    disabled: false,
-
-                    prop: "phone",
-                }, {
-                    label: '地址',
-                    prop: "recAddress",
+                    label: '仓库',
+                    prop: "storageId",
                     type: 'select',
-                    allowCreate: true,
-                    filterable: true,
                     disabled: false,
+                    // placeholder: '仓库为空即为异地销售',
                     props: {
-                        label: 'address',
-                        value: 'address'
+                        label: 'cname',
+                        value: 'id'
                     },
-                    dicUrl: '/api/blade-sales-part/corpsAddr/corpIdByAddr?pid={{key}}'
+                    dicUrl: '/api/blade-sales-part/storageDesc/listAll',
+                    rules: [{
+                        required: true,
+                        message: " ",
+                        trigger: "blur"
+                    }]
                 },
-                //  {
-                //     label: '配送方式',
-                //     type: 'select',
-                //     prop: "shipType",
-                //     disabled: false,
-                //     dicUrl: "/api/blade-system/dict-biz/dictionary?code=deliveryMethod",
-                //     props: {
-                //         label: "dictValue",
-                //         value: "dictValue"
-                //     },
-                //     value: '物流'
-                // }, {
-                //     label: '物流公司',
-                //     disabled: false,
-
-                //     prop: "logisticsCorpName"
-                // },
                 // {
-                //     label: '成本',
-                //     prop: "cost",
-                //     display: true,
+                //     label: '来源单号',
+                //     prop: "srcOrdNo",
                 //     disabled: true
                 // }, {
-                //     label: '毛利',
-                //     prop: "grossProfit",
-                //     disabled: true
-                // },
-                // {
-                //     label: '采购金额',
-                //     prop: "salesAmount",
-                //     disabled: true
-                // },
-                //  {
-                //     label: '运费',
-                //     prop: "freight",
+                //     label: '业务来源',
+                //     prop: "businessSource",
                 //     disabled: true
                 // },
                 {
-                    label: '应付类别',
-                    prop: "receivableType",
-                    type: "select",
-                    disabled: false,
-                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=receivableType",
-                    props: {
-                        label: "dictValue",
-                        value: "dictValue"
-                    },
-                    value: '网络支付'
-                },
-                {
                     label: '总金额',
                     prop: "totalMoney",
                     disabled: true
                 },
-
                 {
-                    label: '已付金额',
-                    prop: "paymentAmountTl",
-                    disabled: true
-                },
-
-                {
-                    label: '单据编号',
-                    prop: "ordNo",
-                    disabled: true
+                    label: '配资比例',
+                    prop: "proportion",
+                    disabled: true,
                 },
                 {
-                    label: '资金方',
-                    prop: "fundingPartyName",
-                    disabled: false,
-                    rules: [{
-                        required: true,
-                        message: " ",
-                        trigger: "blur"
-                    }]
+                    label: '融资金额',
+                    prop: "fundingAmount",
+                    disabled: true,
                 },
                 {
-                    label: '配资比例',
-                    prop: "proportion",
+                    label: '保证金',
+                    prop: "bondAmount",
                     disabled: true,
                 },
                 {
-                    label: '是否融资',
-                    prop: "whetherFinancing",
-                    type: 'select',
-                    dicData: [{
-                        label: '是',
-                        value: '1'
-                    }, {
-                        label: '否',
-                        value: '0'
-                    }],
+                    label: '利息',
+                    prop: "interest",
                     disabled: false,
                 },
                 {
@@ -700,29 +612,57 @@ export default {
                     disabled: true,
                 },
                 {
-                    label: '已出实际数量',
+                    label: '已数量',
                     prop: "outGoodsTotalShipNum",
                     disabled: true,
                 },
                 {
-                    label: '已出实际金额',
+                    label: '已金额',
                     prop: "outGoodsTotalShipAmount",
                     disabled: true,
                 },
                 {
-                    label: '融资金额',
-                    prop: "fundingAmount",
-                    disabled: true,
+                    label: '应付类别',
+                    prop: "receivableType",
+                    type: "select",
+                    disabled: false,
+                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=receivableType",
+                    props: {
+                        label: "dictValue",
+                        value: "dictValue"
+                    },
+                    value: '网络支付'
                 },
                 {
-                    label: '保证金',
-                    prop: "bondAmount",
-                    disabled: true,
+                    label: '联系人',
+                    type: "select",
+                    prop: "contacts",
+                    disabled: false,
+                    allowCreate: true,
+                    filterable: true,
+                    props: {
+                        label: 'address',
+                        value: 'id'
+                    },
+                    dicUrl: '/api/blade-sales-part/corpsAddr/corpIdByAddr?pid={{key}}'
+                }, 
+                {
+                    label: '单据编号',
+                    prop: "ordNo",
+                    disabled: true
                 },
                 {
-                    label: '利息',
-                    prop: "interest",
-                    disabled: false,
+                    label: '是否融资',
+                    prop: "whetherFinancing",
+                    type: 'select',
+                    dicData: [{
+                        label: '是',
+                        value: '1'
+                    }, {
+                        label: '否',
+                        value: '0'
+                    }],
+                    disabled: true,
                 },
                 {
                     label: '备注',

+ 195 - 267
src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -17,28 +17,13 @@
             </span>
           </span>
         </template>
-        <template slot-scope="{ row }" slot="actualPaymentStatus">
-          <span v-for="(item, index) in actualStatusList" :key="index">
-            <span v-if="item.dictKey == row.actualPaymentStatus" :style="{ background: item.colour }" class="bottomBox">
-              {{ item.dictValue }}
-            </span>
-          </span>
-        </template>
-        <template slot-scope="{ row }" slot="returnsStatus">
-          <span v-for="(item, index) in returnStatusList" :key="index">
-            <span v-if="item.dictKey == row.returnsStatus" :style="{ background: item.colour }" class="bottomBox">
-              {{ item.dictValue }}
-            </span>
-          </span>
-        </template>
         <template slot-scope="{type,size,row,index}" slot="menu">
           <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
           <!--  判断是否一键采购过 然后展示不同的判断按钮-->
           <el-button v-if="row.shortcutWarehousingStatus == '1'" :size="size" :type="type"
             :disabled="row.status != '录入' && row.item >= 1" @click="$refs.crud.rowDel(row, index)">删除</el-button>
-
           <el-button v-else :size="size" :type="type"
-            :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.numberRows >= 1"
+            :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.numberRows >= 1 || row.confirmWarehouse == 1 || row.whetherRedeem == 1"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
           <el-button v-if="row.confirmWarehouse != 1" :size="size" :type="type"
             @click="confirm(row, index, 1)">确认入库</el-button>
@@ -54,7 +39,7 @@
           <el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
-          
+
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button>
           <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
         </template>
@@ -62,11 +47,10 @@
           <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.ordNo }}
           </span>
         </template>
-        <template slot-scope="{ row, index }" slot="srcOrdNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 3)">{{ row.srcOrdNo }}
+        <template slot-scope="{ row, index }" slot="customerName">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.customerName }}
           </span>
         </template>
-
       </avue-crud>
     </basic-container>
     <detailsPage v-if="detailsOpen" :onLoad="form" :detailData="detailData" @backToList="backToList"></detailsPage>
@@ -74,7 +58,7 @@
 </template>
 
 <script>
-import { getList, remove, getGoodsInfo, confirmWarehouse, revokeWarehouse,confirmRedeem,revokeRedeem } from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { getList, remove, getGoodsInfo, confirmWarehouse, revokeWarehouse, confirmRedeem, revokeRedeem } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import detailsPage from "./detailsPage"
 import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { getToken } from "@/util/auth";
@@ -192,19 +176,6 @@ export default {
             disabled: false,
             width: 100
           },
-          // {
-          //   label: '品牌',
-          //   prop: 'brandId',
-          //   disabled: false,
-          //   width: 100,
-          //   overHidden: true,
-          //   type: 'select',
-          //   props: {
-          //     label: 'cname',
-          //     value: 'id'
-          //   },
-          //   dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
-          // },
           {
             label: '品牌',
             prop: 'brandName',
@@ -275,245 +246,202 @@ export default {
           type: 'sum',
           decimals: 2
         },],
-        column: [{
-          label: '采购单号',
-          prop: "ordNo",
-          search: true,
-          overHidden: true,
-        },
-        //  {
-        //   label: '来源单号',
-        //   prop: "srcOrdNo",
-        //   search: true,
-        //   overHidden: true,
-        // },
-        // {
-        //   label: "业务来源",
-        //   prop: "businessSource",
-        //   overHidden: true,
-        //   search: true,
-        //   type: 'select',
-        //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=business_Source",
-        //   props: {
-        //     label: "dictValue",
-        //     value: "dictKey"
-        //   }
-        // },
-        {
-          label: '所属公司',
-          prop: "salesCompanyName",
-          overHidden: true,
-        }, {
-          label: '业务对象',
-          prop: "customerName",
-          type: 'select',
-          search: true,
-          overHidden: true,
-          filterable: true,
-          remote: true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
+        column: [
+          {
+            label: '供应商',
+            prop: "customerName",
+            type: 'select',
+            search: true,
+            overHidden: true,
+            filterable: true,
+            remote: true,
+            props: {
+              label: 'cname',
+              value: 'cname',
+              // res: 'data.records'
+            },
+            dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
-        }, {
-          label: '资金方',
-          prop: "fundingPartyName",
-          type: 'select',
-          search: true,
-          overHidden: true,
-          filterable: true,
-          remote: true,
-          props: {
-            label: 'cname',
-            value: 'cname',
-            res: 'data.records'
+          {
+            label: '资金方',
+            prop: "fundingPartyName",
+            type: 'select',
+            search: true,
+            overHidden: true,
+            filterable: true,
+            remote: true,
+            props: {
+              label: 'cname',
+              value: 'cname',
+              res: 'data.records'
+            },
+            dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
-        },
-        {
-          label: '显示已完成',
-          prop: 'notComplete',
-          overHidden: true,
-          hide: true,
-          search: true,
-          searchslot: true
-        }, {
-          label: '仓库',
-          prop: "storageName",
-          search: true,
-          // remote:true,
-          overHidden: true,
-          type: 'select',
-          props: {
-            label: 'cname',
-            value: 'cname'
+          {
+            label: '显示已完成',
+            prop: 'notComplete',
+            overHidden: true,
+            hide: true,
+            search: true,
+            searchslot: true
           },
-          dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
-        }, {
-          label: '行数',
-          prop: "numberRows",
-          overHidden: true,
-        }, {
-          label: '商品名称',
-          prop: "goodsNameJoin",
-          search: true,
-          overHidden: true,
-          // filterable: true,
-          // remote:true,
-          // type: 'select',
-          // props: {
-          //   label: 'cname',
-          //   value: 'cname',
-          //   res: 'data.records'
-          // },
-          // dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=20&cname={{key}}"
-        }, {
-          label: '数量',
-          prop: "goodsTotalNum",
-          overHidden: true,
-        },
-        // {
-        //   label: '金额',
-        //   prop: "totalMoney",
-        //   overHidden: true,
-        // }, 
-        {
-          label: '已付金额',
-          prop: "paymentAmountTl",
-          disabled: true
-        },
-        {
-          label: '融资金额',
-          prop: "fundingAmount",
-          overHidden: true,
-        },
-        {
-          label: '保证金',
-          prop: "bondAmount",
-          overHidden: true,
-        },
-        {
-          label: '利息',
-          prop: "interest",
-          overHidden: true,
-        },
-        {
-          label: '状态',
-          prop: "status",
-          search: true,
-          overHidden: true,
-          type: 'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=procurement_Status",
-          props: {
-            label: "dictValue",
-            value: "dictKey"
-          }
-        },
-        {
-          label: '结算状态',
-          prop: "actualPaymentStatus",
-          searchProp: 'actualPaymentType',
-          search: true,
-          overHidden: true,
-          type: 'select',
-          dicData: [
-            {
-              label: "待付款",
-              value: 1,
+          {
+            label: '业务日期',
+            prop: "businesDate",
+            overHidden: true,
+            searchProp: "businesDateList",
+            type: "date",
+            search: true,
+            width: 100,
+            unlinkPanels: true,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: '仓库',
+            prop: "storageName",
+            search: true,
+            // remote:true,
+            overHidden: true,
+            type: 'select',
+            props: {
+              label: 'cname',
+              value: 'cname'
             },
-            {
-              label: "已付款",
-              value: 2,
+            dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
+          }, {
+            label: '总金额',
+            prop: "totalMoney",
+            overHidden: true,
+          }, {
+            label: '配资比例',
+            prop: "proportion",
+            overHidden: true,
+            // filterable: true,
+            // remote:true,
+            // type: 'select',
+            // props: {
+            //   label: 'cname',
+            //   value: 'cname',
+            //   res: 'data.records'
+            // },
+            // dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=20&cname={{key}}"
+          }, {
+            label: '融资金额',
+            prop: "fundingAmount",
+            overHidden: true,
+          },
+          {
+            label: '保证金',
+            prop: "bondAmount",
+            overHidden: true,
+          },
+          {
+            label: '利息',
+            prop: "interest",
+            overHidden: true,
+          },
+          {
+            label: '实际金额',
+            prop: "goodsTotalShipAmount",
+            overHidden: true,
+          },
+          {
+            label: '已卖数量',
+            prop: "outGoodsTotalShipNum",
+            overHidden: true,
+          },
+          {
+            label: '已卖金额',
+            prop: "outGoodsTotalShipAmount",
+            overHidden: true,
+          },
+          {
+            label: '应付类别',
+            prop: "receivableType",
+            type: "select",
+            disabled: false,
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=receivableType",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
             },
-            {
-              label: "尾款",
-              value: 3,
+            overHidden: true,
+          },
+          {
+            label: '状态',
+            prop: "status",
+            search: true,
+            overHidden: true,
+            type: 'select',
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=procurement_Status",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
             }
-          ],
-          // dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
-          // props: {
-          //   label: "dictValue",
-          //   value: "dictKey"
-          // }
-        },
-        // {
-        //   label: '应结日期',
-        //   prop: "dueDate",
-        //   overHidden: true,
-        // },
-        {
-          label: '退货状态',
-          prop: "returnsStatus",
-          overHidden: true,
-        },
-        {
-          label: "制单人",
-          prop: "createUserName",
-          searchProp: "createUser",
-          overHidden: true,
-          width: 100,
-          filterable: true,
-          remote: true,
-          type: "select",
-          dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
-          props: {
-            label: "account",
-            value: "id",
-            res: 'data.records'
-          }
-        }, {
-          label: "制单日期",
-          prop: "createTime",
-          searchProp: "createTimeList",
-          type: "date",
-          overHidden: true,
-          width: 100,
-          searchRange: true,
-          searchDefaultTime: ["00:00:00", "23:59:59"],
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
-        }, {
-          label: '业务日期',
-          prop: "businesDate",
-          overHidden: true,
-          searchProp: "businesDateList",
-          type: "date",
-          search: true,
-          width: 100,
-          unlinkPanels: true,
-          searchRange: true,
-          searchDefaultTime: ["00:00:00", "23:59:59"],
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
-        }, {
-          label: "更新人",
-          prop: "updateUserName",
-          searchProp: "updateUser",
-          overHidden: true,
-          width: 100,
-          filterable: true,
-          remote: true,
-          type: "select",
-          dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
-          props: {
-            label: "account",
-            value: "id",
-            res: 'data.records'
-          }
-        }, {
-          label: "更新日期",
-          prop: "updateTime",
-          searchProp: "updateTimeList",
-          type: "date",
-          overHidden: true,
-          width: 100,
-          searchRange: true,
-          searchDefaultTime: ["00:00:00", "23:59:59"],
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
-        }]
+          },
+          {
+            label: '单据编号',
+            prop: "ordNo",
+            search: true,
+            overHidden: true,
+          },
+          {
+            label: "制单人",
+            prop: "createUserName",
+            searchProp: "createUser",
+            overHidden: true,
+            width: 100,
+            filterable: true,
+            remote: true,
+            type: "select",
+            dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+            props: {
+              label: "account",
+              value: "id",
+              res: 'data.records'
+            }
+          }, {
+            label: "制单日期",
+            prop: "createTime",
+            searchProp: "createTimeList",
+            type: "date",
+            overHidden: true,
+            width: 100,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: "更新人",
+            prop: "updateUserName",
+            searchProp: "updateUser",
+            overHidden: true,
+            width: 100,
+            filterable: true,
+            remote: true,
+            type: "select",
+            dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+            props: {
+              label: "account",
+              value: "id",
+              res: 'data.records'
+            }
+          }, {
+            label: "更新日期",
+            prop: "updateTime",
+            searchProp: "updateTimeList",
+            type: "date",
+            overHidden: true,
+            width: 100,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          }]
       }
     }
   },

+ 3 - 3
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -2140,7 +2140,7 @@ export default {
                                 this.isDisabledTask = false
                                 this.$set(this.optionForm, 'disabled', false) // form 表单的禁用放开
                                 this.$set(this.optionContactsBack, 'disabled', false) // table 表格的禁用放开
-                                // this.editButton = true // 把编辑按钮显示出来
+                                this.editButton = true // 把编辑按钮显示出来
                                 //添加删除按钮禁用
                                 this.isAdd = true
                                 if (this.form.businessSource == "外部销售") {
@@ -2267,8 +2267,6 @@ export default {
                         this.refresh(res.data.data.id)
                         this.isDisabledTask = false
                         // this.editButton = true
-
-                        this.$set(this.optionForm, 'disabled', true)
                         this.$set(this.optionContactsBack, 'disabled', true)
                         loading.close();
                     }).finally(() => {
@@ -2380,6 +2378,7 @@ export default {
                     // this.isDisabledTask = false;
                     this.buttonColor = 'warning'
                     this.optionForm.disabled = true
+                    this.$set(this.optionForm, 'disabled', true)
                 }
                 if (this.form.status == '退款请核') {
                     this.isRevocationRequest = false;
@@ -2528,6 +2527,7 @@ export default {
                     // this.isDisabledTask = false;
                     this.buttonColor = 'warning'
                     this.optionForm.disabled = true
+                    this.$set(this.optionForm, 'disabled', true)
                 }
                 if (this.form.status == '退款请核') {
                     this.isRevocationRequest = false;