瀏覽代碼

Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

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

+ 99 - 75
src/api/basicData/deliveryNotice.js

@@ -2,114 +2,135 @@ import request from '@/router/axios';
 
 //客户资料列表查询
 export function customerList(data) {
-    return request({
-        url: '/api/blade-deliver-goods/delivery/list',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: '/api/blade-deliver-goods/delivery/list',
+    method: 'get',
+    params: data
+  })
 }
+
 //客户资料列表修改和新增
 export function typeSave(data) {
-    return request({
-        url: '/api/blade-deliver-goods/delivery/submit',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/api/blade-deliver-goods/delivery/submit',
+    method: 'post',
+    data: data
+  })
 }
+
 //客户资料列表查看明细
 export function detail(data) {
-    return request({
-        url: '/api/blade-deliver-goods/delivery/detail?id='+data,
-        method: 'get'
-    })
+  return request({
+    url: '/api/blade-deliver-goods/delivery/detail?id=' + data,
+    method: 'get'
+  })
 }
+
 //商品从表列表删除
 export function corpsattn(data) {
-    return request({
-        url: '/api/blade-deliver-goods/deliveryitems/update',
-        method: 'post',
-        data: {
-            id:data
-        }
-    })
+  return request({
+    url: '/api/blade-deliver-goods/deliveryitems/update',
+    method: 'post',
+    data: {
+      id: data
+    }
+  })
 }
+
 //发货列表删除
 export function deleteDetails(data) {
-    return request({
-        url: '/api/blade-deliver-goods/delivery/update',
-        method: 'post',
-        data: {
-            id:data
-        }
-    })
+  return request({
+    url: '/api/blade-deliver-goods/delivery/update',
+    method: 'post',
+    data: {
+      id: data
+    }
+  })
 }
+
 //附件列表删除
 export function corpsbank(data) {
-    return request({
-        url: '/api/blade-deliver-goods/deliveryfiles/update',
-        method: 'post',
-        data: {
-            id:data
-        }
-    })
+  return request({
+    url: '/api/blade-deliver-goods/deliveryfiles/update',
+    method: 'post',
+    data: {
+      id: data
+    }
+  })
 }
+
 //费用明细列表删除
 export function corpsitem(data) {
-    return request({
-        url: '/api/blade-deliver-goods/deliveryfees/update',
-        method: 'post',
-        data: {
-            id:data
-        }
-    })
+  return request({
+    url: '/api/blade-deliver-goods/deliveryfees/update',
+    method: 'post',
+    data: {
+      id: data
+    }
+  })
 }
+
 //查询客户类型主页下拉
-export function getDeptLazyTree(parentId){
-    return request({
-        url: '/api/blade-client/corpstype/lazy-tree',
-        method: 'get',
-        params: {
-            parentId
-        }
-    })
+export function getDeptLazyTree(parentId) {
+  return request({
+    url: '/api/blade-client/corpstype/lazy-tree',
+    method: 'get',
+    params: {
+      parentId
+    }
+  })
 }
+
 export const getDeptLazyTreeS = (parentId) => {
-    return request({
-        url: '/api/blade-client/goodstype/lazy-tree',
-        method: 'get',
-        params: {
-            parentId
-        }
-    })
+  return request({
+    url: '/api/blade-client/goodstype/lazy-tree',
+    method: 'get',
+    params: {
+      parentId
+    }
+  })
 }
 
 //政策列表查看明细
 export function detailList(data) {
-    return request({
-        url: '/api/blade-mocha-item/salespolicy/detail?id='+data,
-        method: 'get'
-    })
+  return request({
+    url: '/api/blade-mocha-item/salespolicy/detail?id=' + data,
+    method: 'get'
+  })
 }
+
 export const getList = (current, size, params, goodsTypeId) => {
-    return request({
-        url: '/api//blade-client/goodsdesc/selectGoods',
-        method: 'get',
-        params: {
-            ...params,
-            current,
-            size,
-            goodsTypeId,
-        }
-    })
+  return request({
+    url: '/api//blade-client/goodsdesc/selectGoods',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+      goodsTypeId,
+    }
+  })
 }
 
 //查询客户类型下拉
 export function corpstypeTree() {
-    return request({
-        url: '/api/blade-client/corpstype/tree',
-        method: 'get'
-    })
+  return request({
+    url: '/api/blade-client/corpstype/tree',
+    method: 'get'
+  })
 }
+
+//生成凭证
+export function takeDeliveryBatch(ids) {
+  return request({
+    url: '/api/blade-deliver-goods/delivery/takeDeliveryBatch',
+    method: 'get',
+    params: {
+      ids
+    }
+  })
+}
+
 //确认发货
 export function sendOutGoods(data) {
   return request({
@@ -118,6 +139,7 @@ export function sendOutGoods(data) {
     data: data
   })
 }
+
 // 撤销发货
 export function revokeOutGoods(data) {
   return request({
@@ -126,6 +148,7 @@ export function revokeOutGoods(data) {
     data: data
   })
 }
+
 // 确认到货
 export function confirmArrival(data) {
   return request({
@@ -134,6 +157,7 @@ export function confirmArrival(data) {
     data: data
   })
 }
+
 // 撤销到货
 export function cancelArrival(data) {
   return request({

+ 8 - 1
src/api/tirePartsMall/basicData/listingManagement/index.js

@@ -32,4 +32,11 @@ export const getDetail = (params) => {
     method: 'get',
     params: params
   })
-}
+}
+// 所有品牌
+export const listAll = (params) => {
+  return request({
+    url: '/api/blade-sales-part/brandDesc/listAll',
+    method: 'get'
+  })
+}

+ 7 - 0
src/api/tirePartsMall/purchasingManagement/warehouseEntryOrder.js

@@ -47,3 +47,10 @@ export const warehousingComplete = (data) => {
     data: data
   })
 }
+export const goodsDetail = (data) => {
+  return request({
+    url: '/api/blade-sales-part/goodsDesc/goodsDetail',
+    method: 'GET',
+    params: data
+  })
+}

+ 65 - 0
src/router/views/index.js

@@ -2458,5 +2458,70 @@ export default [{
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/supplier/index')
   }]
+}, {
+  path: '/tirePartsMall/purchasingManagement/warehouseEntryOrder/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/purchasingManagement/warehouseEntryOrder/index',
+    name: '入库工单',
+    meta: {
+      i18n: '/tirePartsMall/purchasingManagement/warehouseEntryOrder/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index')
+  }]
+}, {
+  path: '/tirePartsMall/salesManagement/saleOrder/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/salesManagement/saleOrder/index',
+    name: '销售订单',
+    meta: {
+      i18n: '/tirePartsMall/salesManagement/saleOrder/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/salesManagement/saleOrder/index')
+  }]
+}, {
+  path: '/tirePartsMall/salesManagement/outboundWorkOrder/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/salesManagement/outboundWorkOrder/index',
+    name: '出库工单(L)',
+    meta: {
+      i18n: '/tirePartsMall/salesManagement/outboundWorkOrder/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/salesManagement/outboundWorkOrder/index')
+  }]
+}, {
+  path: '/tirePartsMall/basicData/listingManagement/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/basicData/listingManagement/index',
+    name: '上架管理',
+    meta: {
+      i18n: '/tirePartsMall/basicData/listingManagement/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/listingManagement/index')
+  }]
+}, {
+  path: '/tirePartsMall/basicData/shareListing/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/basicData/shareListing/index',
+    name: '共享上架',
+    meta: {
+      i18n: '/tirePartsMall/basicData/shareListing/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/shareListing/index')
+  }]
 }
 ]

+ 1225 - 262
src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -1,245 +1,246 @@
 <template>
-    <div v-loading.fullscreen.lock="fullscreenLoading">
-        <div class="customer-head">
-            <div class="customer-back">
-                <el-button
-                        type="danger"
-                        style="border: none;background: none;color: red"
-                        icon="el-icon-arrow-left"
-                        @click="backToList"
-                >返回列表
-                </el-button>
-            </div>
-            <div>
-                <div class="el-button&#45;&#45;small-yh add-customer-btn" v-if="param.paramValue == 1">
-                    <el-button type="success" size="small" @click="release()" :disabled="form.status !== 0">发布
-                    </el-button>
-                    <el-button type="warning" size="small" @click="toVoid()" :disabled="form.status !== 4">取消发布
-                    </el-button>
-                    <el-button type="primary" size="small" @click="storage()">保存</el-button>
-                </div>
-                <div class="el-button&#45;&#45;small-yh add-customer-btn" v-else>
-                    <el-button type="success" size="small" @click="release()" :disabled="form.status !== 3">发布
-                    </el-button>
-                    <el-button type="warning" size="small" @click="pleaseCheck()" :disabled="form.status !== 0">请核
-                    </el-button>
-                    <el-button type="warning" size="small" @click.stop="checkDialog = true,checkData = detailData.check"
-                               v-if="checkDisabled">审批
-                    </el-button>
-                    <el-button type="primary" size="small" @click="storage()">保存</el-button>
-                    <el-dropdown style="margin-left: 10px">
-                        <el-button type="primary" size="small">
-                            业务处理<i class="el-icon-arrow-down el-icon--right"></i>
-                        </el-button>
-                        <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item @click.native="copyNew()" :disabled="!form.id">复制新增</el-dropdown-item>
-                            <el-dropdown-item @click.native="toVoid()" :disabled="form.status < 4 || !form.status">
-                                取消发布
-                            </el-dropdown-item>
-                            <el-dropdown-item @click.native="checkScheduleDialog = true,checkId=form.id"
-                                              :disabled="form.status < 0 || !form.status">审批流程
-                            </el-dropdown-item>
-                        </el-dropdown-menu>
-                    </el-dropdown>
-                </div>
-            </div>
+  <div v-loading.fullscreen.lock="fullscreenLoading">
+    <div class="customer-head">
+      <div class="customer-back">
+        <el-button
+            type="danger"
+            style="border: none;background: none;color: red"
+            icon="el-icon-arrow-left"
+            @click="backToList"
+        >返回列表
+        </el-button>
+      </div>
+      <div>
+        <div class="el-button&#45;&#45;small-yh add-customer-btn" v-if="param.paramValue == 1">
+          <el-button type="primary" size="small" @click.native="copyNew()" :disabled="!form.id">复制新增</el-button>
+          <el-button type="success" size="small" @click="release()" :disabled="form.status !== 0">发布
+          </el-button>
+          <el-button type="warning" size="small" @click="toVoid()" :disabled="form.status !== 4">取消发布
+          </el-button>
+          <el-button type="primary" size="small" @click="storage()">保存</el-button>
         </div>
-        <trade-card title="基础资料" style="margin-top: 50px">
-            <avue-form :option="optionForm" v-model="form" ref="form"></avue-form>
-        </trade-card>
-        <trade-card title="箱信息">
-            <avue-crud ref="crudBox" :key="key" :option="optionBox" :data="dataListBox"
-                       @resetColumn="resetColumn('crudBox','optionBox','optionBoxTwo',201.1)"
-                       @saveColumn="saveColumn('crudBox','optionBox','optionBoxTwo',201.1)">
-                <template slot-scope="{row,index}" slot="menu">
-                    <el-button
-                            type="text"
-                            size="small"
-                            :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
-                            @click="edit(row)"
-                    >{{ row.$cellEdit ? '确 认' : '编 辑' }}
-                    </el-button>
-                    <el-button
-                            type="text"
-                            size="small"
-                            icon="el-icon-delete"
-                            v-if="form.status === 0 || !form.status"
-                            @click="rowDel(row,index,'box')"
-                    >删 除
-                    </el-button>
-                </template>
-            </avue-crud>
-        </trade-card>
-        <trade-card title="代理信息">
-            <avue-crud ref="crudAgent" :key="key" :option="optionAgent" :data="dataListAgent" @row-update="rowUpdate"
-                       @row-save="rowSave"
-                       @resetColumn="resetColumn('crudAgent','optionAgent','optionAgentTwo',201.2)"
-                       @saveColumn="saveColumn('crudAgent','optionAgent','optionAgentTwo',201.2)">
-                <template slot-scope="{row,index}" slot="menu">
-                    <el-button
-                            type="text"
-                            size="small"
-                            :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
-                            @click="edit(row,index,false)"
-                    >{{ row.$cellEdit ? '确 认' : '编 辑' }}
-                    </el-button>
-                    <el-button
-                            type="text"
-                            size="small"
-                            icon="el-icon-delete"
-                            v-if="form.status === 0 || !form.status"
-                            @click="rowDel(row,index,'agent')"
-                    >删 除
-                    </el-button>
-                </template>
-                <template slot="menuLeft">
-                    <el-button
-                            type="success"
-                            size="small"
-                            icon="el-icon-bottom"
-                            @click="dialogVisible = true"
-                    >导入
-                    </el-button>
-                </template>
-            </avue-crud>
-        </trade-card>
-        <trade-card title="投标对比">
-            <avue-crud ref="crudBid" :key="key" :option="optionBid" :data="dataListBid"
-                       @resetColumn="resetColumn('crudBid','optionBid','optionBidTwo',201.3)"
-                       @saveColumn="saveColumn('crudBid','optionBid','optionBidTwo',201.3)">
-                <template slot-scope="{row,index}" slot="menu">
-                    <el-button
-                            type="text"
-                            size="small"
-                            :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
-                            @click="edit(row)"
-                    >{{ row.$cellEdit ? '确 认' : '编 辑' }}
-                    </el-button>
-                    <el-button
-                            type="text"
-                            size="small"
-                            @click="winningTheBid(row,index)"
-                            v-if="row.status === 5"
-                    >确认中标
-                    </el-button>
-                </template>
-            </avue-crud>
-        </trade-card>
-        <el-dialog
-                v-dialogdrag
-                title="导入客户"
-                :fullscreen="dialogFull"
-                :visible.sync="dialogVisible"
-                class="el-dialogDeep"
-                append-to-body
-                :close-on-click-modal="false"
-                width="80%"
-        >
-            <template slot="title">
+        <div class="el-button&#45;&#45;small-yh add-customer-btn" v-else>
+          <el-button type="success" size="small" @click="release()" :disabled="form.status !== 3">发布
+          </el-button>
+          <el-button type="warning" size="small" @click="pleaseCheck()" :disabled="form.status !== 0">请核
+          </el-button>
+          <el-button type="warning" size="small" @click.stop="checkDialog = true,checkData = detailData.check"
+                     v-if="checkDisabled">审批
+          </el-button>
+          <el-button type="primary" size="small" @click="storage()">保存</el-button>
+          <el-dropdown style="margin-left: 10px">
+            <el-button type="primary" size="small">
+              业务处理<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item @click.native="copyNew()" :disabled="!form.id">复制新增</el-dropdown-item>
+              <el-dropdown-item @click.native="toVoid()" :disabled="form.status < 4 || !form.status">
+                取消发布
+              </el-dropdown-item>
+              <el-dropdown-item @click.native="checkScheduleDialog = true,checkId=form.id"
+                                :disabled="form.status < 0 || !form.status">审批流程
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+      </div>
+    </div>
+    <trade-card title="基础资料" style="margin-top: 50px">
+      <avue-form :option="optionForm" v-model="form" ref="form"></avue-form>
+    </trade-card>
+    <trade-card title="箱信息">
+      <avue-crud ref="crudBox" :key="key" :option="optionBox" :data="dataListBox"
+                 @resetColumn="resetColumn('crudBox','optionBox','optionBoxTwo',201.1)"
+                 @saveColumn="saveColumn('crudBox','optionBox','optionBoxTwo',201.1)">
+        <template slot-scope="{row,index}" slot="menu">
+          <el-button
+              type="text"
+              size="small"
+              :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
+              @click="edit(row)"
+          >{{ row.$cellEdit ? '确 认' : '编 辑' }}
+          </el-button>
+          <el-button
+              type="text"
+              size="small"
+              icon="el-icon-delete"
+              v-if="form.status === 0 || !form.status"
+              @click="rowDel(row,index,'box')"
+          >删 除
+          </el-button>
+        </template>
+      </avue-crud>
+    </trade-card>
+    <trade-card title="代理信息">
+      <avue-crud ref="crudAgent" :key="key" :option="optionAgent" :data="dataListAgent" @row-update="rowUpdate"
+                 @row-save="rowSave"
+                 @resetColumn="resetColumn('crudAgent','optionAgent','optionAgentTwo',201.2)"
+                 @saveColumn="saveColumn('crudAgent','optionAgent','optionAgentTwo',201.2)">
+        <template slot-scope="{row,index}" slot="menu">
+          <el-button
+              type="text"
+              size="small"
+              :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
+              @click="edit(row,index,false)"
+          >{{ row.$cellEdit ? '确 认' : '编 辑' }}
+          </el-button>
+          <el-button
+              type="text"
+              size="small"
+              icon="el-icon-delete"
+              v-if="form.status === 0 || !form.status"
+              @click="rowDel(row,index,'agent')"
+          >删 除
+          </el-button>
+        </template>
+        <template slot="menuLeft">
+          <el-button
+              type="success"
+              size="small"
+              icon="el-icon-bottom"
+              @click="dialogVisible = true"
+          >导入
+          </el-button>
+        </template>
+      </avue-crud>
+    </trade-card>
+    <trade-card title="投标对比">
+      <avue-crud ref="crudBid" :key="key" :option="optionBid" :data="dataListBid"
+                 @resetColumn="resetColumn('crudBid','optionBid','optionBidTwo',201.3)"
+                 @saveColumn="saveColumn('crudBid','optionBid','optionBidTwo',201.3)">
+        <template slot-scope="{row,index}" slot="menu">
+          <el-button
+              type="text"
+              size="small"
+              :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
+              @click="edit(row)"
+          >{{ row.$cellEdit ? '确 认' : '编 辑' }}
+          </el-button>
+          <el-button
+              type="text"
+              size="small"
+              @click="winningTheBid(row,index)"
+              v-if="row.status === 5"
+          >确认中标
+          </el-button>
+        </template>
+      </avue-crud>
+    </trade-card>
+    <el-dialog
+        v-dialogdrag
+        title="导入客户"
+        :fullscreen="dialogFull"
+        :visible.sync="dialogVisible"
+        class="el-dialogDeep"
+        append-to-body
+        :close-on-click-modal="false"
+        width="80%"
+    >
+      <template slot="title">
                 <span class="el-dialog__title">
                   <span
                       style="display:inline-block;background-color: #3478f5;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"
                   ></span>
                   导入客户
                 </span>
-                <div
-                    style="float: right"
-                    class="avue-crud__dialog__menu"
-                    @click="dialogFull ? (dialogFull = false) : (dialogFull = true)">
-                    <i class="el-icon-full-screen"></i>
-                </div>
-            </template>
-            <el-row style="height: 0">
-                <el-col :span="5">
-                    <div class="box">
-                        <el-scrollbar>
-                            <basic-container>
-                                <avue-tree
-                                        :option="treeOption"
-                                        :data="treeData"
-                                        @node-click="nodeClick"
-                                />
-                            </basic-container>
-                        </el-scrollbar>
-                    </div>
-                </el-col>
-                <el-col :span="19">
-                    <basic-container>
-                        <avue-crud
-                                :option="option"
-                                :data="dataList"
-                                ref="crud"
-                                v-model="form"
-                                :page.sync="page"
-                                :before-close="beforeClose"
-                                @search-change="searchChange"
-                                @search-reset="searchReset"
-                                @refresh-change="refreshChange"
-                                @selection-change="selectionChange"
-                                @on-load="onLoad"
-                                @saveColumn="saveColumn('crud','option','option',47)"
-                                @tree-load="treeLoad"
-                        >
-                        </avue-crud>
-                    </basic-container>
-                </el-col>
-            </el-row>
-            <span slot="footer" class="dialog-footer">
+        <div
+            style="float: right"
+            class="avue-crud__dialog__menu"
+            @click="dialogFull ? (dialogFull = false) : (dialogFull = true)">
+          <i class="el-icon-full-screen"></i>
+        </div>
+      </template>
+      <el-row style="height: 0">
+        <el-col :span="5">
+          <div class="box">
+            <el-scrollbar>
+              <basic-container>
+                <avue-tree
+                    :option="treeOption"
+                    :data="treeData"
+                    @node-click="nodeClick"
+                />
+              </basic-container>
+            </el-scrollbar>
+          </div>
+        </el-col>
+        <el-col :span="19">
+          <basic-container>
+            <avue-crud
+                :option="option"
+                :data="dataList"
+                ref="crud"
+                v-model="form"
+                :page.sync="page"
+                :before-close="beforeClose"
+                @search-change="searchChange"
+                @search-reset="searchReset"
+                @refresh-change="refreshChange"
+                @selection-change="selectionChange"
+                @on-load="onLoad"
+                @saveColumn="saveColumn('crud','option','option',47)"
+                @tree-load="treeLoad"
+            >
+            </avue-crud>
+          </basic-container>
+        </el-col>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button
-                type="primary"
-                @click="confirmSelection"
-                :disabled="selection.length > 0 ? false : true"
+            type="primary"
+            @click="confirmSelection"
+            :disabled="selection.length > 0 ? false : true"
         >确 定</el-button>
       </span>
-        </el-dialog>
-        <el-dialog
-                append-to-body
-                title="审批"
-                class="el-dialogDeep"
-                :visible.sync="checkDialog"
-                width="50%"
-                :close-on-click-modal="false"
-                :destroy-on-close="true"
-                :close-on-press-escape="false"
-                v-dialog-drag
-        >
-            <check
-                    :checkData="checkData"
-                    :checkDetail="false"
-                    :idList="[]"
-                    @choceCheckFun="checkDialog = false"
-            >
-            </check>
-        </el-dialog>
-        <el-dialog
-                append-to-body
-                title="审批进度"
-                class="el-dialogDeep"
-                :visible.sync="checkScheduleDialog"
-                width="40%"
-                :close-on-click-modal="false"
-                :destroy-on-close="true"
-                :close-on-press-escape="false"
-                v-dialog-drag
-        >
-            <check-schedule
-                    :checkId="checkId"
-                    :batchNo="batchNo"
-                    @choceScheduleFun="checkScheduleDialog = false"
-            >
-            </check-schedule>
-        </el-dialog>
-    </div>
+    </el-dialog>
+    <el-dialog
+        append-to-body
+        title="审批"
+        class="el-dialogDeep"
+        :visible.sync="checkDialog"
+        width="50%"
+        :close-on-click-modal="false"
+        :destroy-on-close="true"
+        :close-on-press-escape="false"
+        v-dialog-drag
+    >
+      <check
+          :checkData="checkData"
+          :checkDetail="false"
+          :idList="[]"
+          @choceCheckFun="checkDialog = false"
+      >
+      </check>
+    </el-dialog>
+    <el-dialog
+        append-to-body
+        title="审批进度"
+        class="el-dialogDeep"
+        :visible.sync="checkScheduleDialog"
+        width="40%"
+        :close-on-click-modal="false"
+        :destroy-on-close="true"
+        :close-on-press-escape="false"
+        v-dialog-drag
+    >
+      <check-schedule
+          :checkId="checkId"
+          :batchNo="batchNo"
+          @choceScheduleFun="checkScheduleDialog = false"
+      >
+      </check-schedule>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    detailDelegationList,
-    saveSaveList,
-    boxDelete,
-    agentDelete,
-    confirmRelease, confirmVoid, confirmPleaseCheck, confirmWinningTheBid, allList, paramList,corpByAttnList
+  detailDelegationList,
+  saveSaveList,
+  boxDelete,
+  agentDelete,
+  confirmRelease, confirmVoid, confirmPleaseCheck, confirmWinningTheBid, allList, paramList, corpByAttnList
 } from "@/api/bidingDocument/issueTender";
 import check from "@/components/check/check";
 import checkSchedule from "@/components/check/checkSchedule";
@@ -250,44 +251,43 @@ import {customerParameter} from "@/enums/management-type";
 import {getDictionary} from "@/api/system/dictbiz";
 
 export default {
-    name: "detailsPageEdit",
-    components: {
-        check,
-        checkSchedule
-    },
-    watch: {
-        form: {
-            handler(newValue, oldValue) {
-                if (this.form.status > 0) {
-                    this.$set(this.optionForm, 'disabled', true)
-                    this.$set(this.optionBox, 'addRowBtn', false)
-                    this.$set(this.optionAgent, 'addRowBtn', false)
-                    this.optionBox.column.forEach(item => {
-                        this.$set(item, 'disabled', true)
-                        if (item.prop === "remark") {
-                            this.$set(item, 'disabled', false)
-                        }
-                    })
-                    this.optionAgent.column.forEach(item => {
-                        this.$set(item, 'disabled', true)
-                        if (item.prop === "remark") {
-                            this.$set(item, 'disabled', false)
-                        }
-                    })
-                } else {
-                    this.$set(this.optionForm, 'disabled', false)
-                    this.findObject(this.optionForm.column, "status").disabled = true
-                    this.$set(this.optionBox, 'disabled', false)
-                    if (this.optionBox.column) {
-                        this.findObject(this.optionBox.column, "status").disabled = true
-                    }
-                    this.$set(this.optionAgent, 'disabled', false)
-                    if (this.optionAgent.column) {
-                        this.findObject(this.optionAgent.column, "status").disabled = true
-                    }
-                }
+  name: "detailsPageEdit",
+  components: {
+    check,
+    checkSchedule
+  },
+  watch: {
+    form: {
+      handler(newValue, oldValue) {
+        if (this.form.status > 0) {
+          this.$set(this.optionForm, 'disabled', true)
+          this.$set(this.optionBox, 'addRowBtn', false)
+          this.$set(this.optionAgent, 'addRowBtn', false)
+          this.optionBox.column.forEach(item => {
+            this.$set(item, 'disabled', true)
+            if (item.prop === "remark") {
+              this.$set(item, 'disabled', false)
+            }
+          })
+          this.optionAgent.column.forEach(item => {
+            this.$set(item, 'disabled', true)
+            if (item.prop === "remark") {
+              this.$set(item, 'disabled', false)
             }
+          })
+        } else {
+          this.$set(this.optionForm, 'disabled', false)
+          this.findObject(this.optionForm.column, "status").disabled = true
+          this.$set(this.optionBox, 'disabled', false)
+          if (this.optionBox.column) {
+            this.findObject(this.optionBox.column, "status").disabled = true
+          }
+          this.$set(this.optionAgent, 'disabled', false)
+          if (this.optionAgent.column) {
+            this.findObject(this.optionAgent.column, "status").disabled = true
+          }
         }
+<<<<<<< HEAD
     },
     data() {
         return {
@@ -1258,7 +1258,970 @@ export default {
                 this.fullscreenLoading = false
             })
         },
+=======
+      }
+>>>>>>> 98ca32bc20041f0f4fb46a8e3e94175ffa6ff9b7
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      option: {},
+      treeOption: {
+        nodeKey: "id",
+        lazy: true,
+        treeLoad: function (node, resolve) {
+          const parentId = node.level === 0 ? 0 : node.data.id;
+          getDeptLazyTree({
+            parentId: parentId,
+            corpType: customerParameter.code
+          }).then(res => {
+            resolve(
+              res.data.data.map(item => {
+                return {
+                  ...item,
+                  leaf: !item.hasChildren
+                };
+              })
+            );
+          });
+        },
+        addBtn: false,
+        menu: false,
+        size: "small",
+        props: {
+          labelText: "标题",
+          label: "title",
+          value: "value",
+          children: "children"
+        }
+      },
+      dataList: [],
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0
+      },
+      dialogFull: false,
+      checkDialog: false,
+      checkScheduleDialog: false,
+      checkId: '',
+      batchNo: '',
+      line: '',
+      key: 0,
+      selection: [],
+      checkData: {},
+      fullscreenLoading: false,
+      optionForm: {
+        submitBtn: false,
+        emptyBtn: false,
+        span: 6,
+        column: [{
+          label: '发布日期',
+          prop: 'releaseTime',
+          type: "datetime",
+          format: 'yyyy-MM-dd HH:mm',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          value: dateFormat(new Date, 'yyyy-MM-dd hh:mm:ss'),
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '截止日期',
+          prop: 'deadlineTime',
+          type: "datetime",
+          format: 'yyyy-MM-dd HH:mm',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '合同号',
+          prop: 'contractNo',
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '状态',
+          disabled: true,
+          prop: 'status',
+          dataType: "number",
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=main_bid_status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          }
+        }, {
+          label: '起运港',
+          prop: 'departureHarbor',
+          filterable: true,
+          type: "select",
+          dicUrl: "/api/blade-client/port/allList",
+          props: {
+            label: "name",
+            value: "name"
+          },
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '目的港',
+          prop: 'objectiveHarbor',
+          filterable: true,
+          type: "select",
+          dicUrl: "/api/blade-client/port/allList",
+          props: {
+            label: "name",
+            value: "name"
+          },
+          change: (data) => {
+            allList().then(res => {
+              for (let item of res.data.data) {
+                if (data.value == item.name) {
+                  this.line = item.line
+                }
+              }
+            })
+          },
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '起运地',
+          prop: 'departureLand',
+          filterable: true,
+          type: "select",
+          dicUrl: "/api/blade-client/port/allList",
+          props: {
+            label: "name",
+            value: "name"
+          }
+        }, {
+          label: '目的地',
+          prop: 'objectiveLand',
+          filterable: true,
+          type: "select",
+          dicUrl: "/api/blade-client/port/allList",
+          props: {
+            label: "name",
+            value: "name"
+          }
+        }, {
+          label: '装柜日期',
+          prop: 'loadingTime',
+          type: "datetime",
+          format: 'yyyy-MM-dd HH:mm',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '是否直航',
+          prop: 'directFlight',
+          type: 'select',
+          dicData: [{
+            label: '是',
+            value: 1
+          }, {
+            label: '否',
+            value: 0
+          }],
+          value: 1,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '转港',
+          prop: 'transshipment',
+          filterable: true,
+          type: "select",
+          dicUrl: "/api/blade-client/port/allList",
+          props: {
+            label: "name",
+            value: "name"
+          }
+        }, {
+          label: '运输方式',
+          prop: 'transportType',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=mode_transport",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          },
+          value: "海运",
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '运输条款',
+          prop: 'transportClause',
+          value: "CY-CY",
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '件数',
+          prop: 'number',
+          value: 10,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '包装',
+          prop: 'packing',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=packaging",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          },
+          value: "木箱",
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '重量(kgs)',
+          prop: 'weight',
+          value: 27000,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '尺码(cmb)',
+          prop: 'size',
+          value: 18,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '货物信息',
+          prop: 'cargoInformation',
+          span: 18,
+          value: "GLASS",
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+        }, {
+          label: '备注',
+          prop: 'remark',
+          type: 'textarea',
+          span: 24,
+        }]
+      },
+      optionBox: {},
+      optionBoxTwo: {
+        align: 'center',
+        index: true,
+        refreshBtn: false,
+        addBtn: false,
+        addRowBtn: true,
+        cellBtn: false,
+        editBtn: false,
+        delBtn: false,
+        column: [{
+          label: '箱型',
+          prop: 'boxType',
+          cell: true,
+          type: "select",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          },
+          index: 1,
+        }, {
+          label: '箱量',
+          prop: 'boxAmount',
+          cell: true,
+          index: 2,
+        },
+          // {
+          //   label: '海运费',
+          //   prop: 'seaFreight',
+          //   cell: true,
+          //   index:3,
+          // }, {
+          //   label: '起运港箱使费',
+          //   prop: 'departureHarborFee',
+          //   cell: true,
+          //   index:4,
+          // }, {
+          //   label: '目的港箱使费',
+          //   prop: 'objectiveHarborFee',
+          //   cell: true,
+          //   index:5,
+          // },
+          {
+            label: '状态',
+            prop: 'status',
+            type: 'select',
+            dataType: "string",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=main_bid_status",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            index: 6,
+          }, {
+            label: '备注',
+            prop: 'remark',
+            cell: true,
+            index: 7,
+          }]
+      },
+      optionAgent: {},
+      optionAgentTwo: {
+        align: 'center',
+        index: true,
+        refreshBtn: false,
+        addBtn: false,
+        addRowBtn: true,
+        cellBtn: false,
+        editBtn: false,
+        delBtn: false,
+        column: [{
+          label: '名称',
+          prop: 'agentId',
+          filterable: true,
+          cell: true,
+          dicUrl: '/api/blade-client/corpsdesc/bidingCorpsList?corpsTypeName=货代',
+          type: 'select',
+          props: {
+            label: "cname",
+            value: "id"
+          },
+          cascader: ['contacts'],
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
+          index: 1,
+        }, {
+          label: '联系人',
+          prop: 'contacts',
+          cell: true,
+          index: 2,
+          type: 'select',
+          dicUrl: `/api/blade-client/corpsattn/corpByAttnList?corpId={{agentId}}`,
+          props: {
+            label: 'cname',
+            value: 'cname'
+          },
+          allowCreate: true,
+          filterable: true,
+        }, {
+          label: '邮箱',
+          prop: 'mailbox',
+          cell: true,
+          index: 3,
+        }, {
+          label: '电话',
+          prop: 'phone',
+          cell: true,
+          index: 4,
+        }, {
+          label: '状态',
+          prop: 'status',
+          type: 'select',
+          dataType: "string",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=main_bid_status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          index: 5,
+        }, {
+          label: '备注',
+          prop: 'remark',
+          cell: true,
+          index: 6,
+        }]
+      },
+      optionBid: {},
+      optionBidTwo: {
+        align: 'center',
+        index: true,
+        refreshBtn: false,
+        addBtn: false,
+        addRowBtn: false,
+        cellBtn: false,
+        editBtn: false,
+        delBtn: false,
+        menuWidth: 140,
+        column: [{
+          label: '名称',
+          prop: 'contrastName',
+          index: 1,
+        }, {
+          label: '船公司',
+          prop: 'shippingCompany',
+          index: 2,
+        }, {
+          label: '船名',
+          prop: 'shipName',
+          index: 3,
+        }, {
+          label: '箱型',
+          prop: 'boxType',
+          type: "select",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          },
+          index: 4,
+        }, {
+          label: '运费',
+          prop: 'seaFreight',
+          index: 5,
+        }, {
+          label: '截单时间',
+          prop: 'cutOffTime',
+          index: 6,
+        }, {
+          label: '截港时间',
+          prop: 'harborInterceptionTime',
+          index: 7,
+        }, {
+          label: '船期',
+          prop: 'shippingDate',
+          index: 8,
+        }, {
+          label: '起运港箱使天数',
+          prop: 'departureHarborFee',
+          index: 9,
+        }, {
+          label: '目的港箱使天数',
+          prop: 'objectiveHarborFee',
+          index: 10,
+        }, {
+          label: '状态',
+          prop: 'status',
+          type: 'select',
+          dataType: "string",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=main_bid_status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          index: 11,
+        }, {
+          label: '备注',
+          prop: 'remark',
+          cell: true,
+          index: 12,
+        }]
+      },
+      form: {},
+      dataListBox: [],
+      dataListAgent: [],
+      dataListBid: [],
+      param: {},
+      checkDisabled: false
+    }
+  },
+  props: {
+    id: {
+      type: String
+    },
+    detailData: {
+      type: Object
+    }
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(47), option);
+    this.optionBox = await this.getColumnData(this.getColumnName(201.1), this.optionBoxTwo);
+    this.optionAgent = await this.getColumnData(this.getColumnName(201.2), this.optionAgentTwo);
+    this.optionBid = await this.getColumnData(this.getColumnName(201.3), this.optionBidTwo);
+    this.key++
+    paramList({
+      paramKey: "release.approval",
+      current: 1,
+      size: 10
+    }).then(res => {
+      for (let item of res.data.data.records) {
+        if (item.paramKey === "release.approval") {
+          this.param = item
+        }
+      }
+    })
+    if (this.id) {
+      this.refreshData(this.id)
+    }
+    if (this.detailData.check) {
+      this.checkDisabled = true
+      this.batchNo = this.detailData.check.batchNo
     }
+    this.findObject(this.optionAgent.column, "contacts").change = ({row, column, value}) => {
+      corpByAttnList({corpId: row.agentId}).then(res => {
+        for (let item of res.data.data) {
+          if (item.cname == value) {
+            row.mailbox = item.email
+            row.phone = item.tel
+          }
+        }
+      })
+    }
+
+    this.findObject(this.optionAgent.column, "agentId").change = ({row, value, column}) => {
+      for (let item of this.$refs.crudAgent.DIC[column.prop]) {
+        if (item.id == value) {
+          corpByAttnList({corpId: value}).then(res => {
+            if (res.data.data.length > 0) {
+              console.log()
+              row.contacts = res.data.data[0].cname
+              row.mailbox = res.data.data[0].email
+              row.phone = res.data.data[0].tel
+            }
+          })
+        }
+      }
+    }
+  },
+  methods: {
+    nodeClick(data) {
+      this.treeDeptId = data.id;
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    //确认导出触发
+    confirmSelection() {
+      for (let item of this.selection) {
+        this.dataListAgent.push({
+          $cellEdit: true,
+          agentId: item.id,
+          contacts: item.attn,
+          phone: item.tel
+        })
+      }
+      this.selection = [];
+      this.dialogVisible = false;
+    },
+    //点击新增时触发
+    beforeClose(done) {
+      this.parentId = "";
+      const column = this.findObject(this.option.column, "parentId");
+      column.value = "";
+      column.addDisabled = false;
+      done();
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      console.log(params);
+      this.treeDeptId = "";
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    //搜索重置按钮触发
+    searchReset() {
+      this.treeDeptId = "";
+      this.onLoad(this.page);
+    },
+    //刷新触发
+    refreshChange() {
+      this.page = {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0
+      };
+    },
+    //选中触发
+    selectionChange(selection) {
+      this.selection = selection;
+    },
+    //树桩列点击展开触发
+    treeLoad(tree, treeNode, resolve) {
+      const parentId = tree.id;
+      customerList({
+        parentId: parentId,
+        corpType: this.corpType ? this.corpType : "KH"
+      }).then(res => {
+        resolve(res.data.data.records);
+      });
+    },
+    onLoad(page, params = {parentId: 0}) {
+      let queryParams = Object.assign({}, params, {
+        size: page.pageSize,
+        current: page.currentPage,
+        corpsTypeId: this.treeDeptId,
+        corpType: this.corpType ? this.corpType : "KH",
+        line: this.line
+      });
+      customerList(queryParams).then(res => {
+        this.dataList = res.data.data.records;
+        this.page.total = res.data.data.total;
+        if (this.page.total) {
+          this.option.height = window.innerHeight - 500;
+        } else {
+          this.option.height = window.innerHeight - 200;
+        }
+      });
+    },
+    //自定义列保存
+    async saveColumn(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+       * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //自定义列重置
+    async resetColumn(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        if (this.form.status > 0) {
+          this.$set(this.optionForm, 'disabled', true)
+          this.$set(this.optionBox, 'addRowBtn', false)
+          this.$set(this.optionAgent, 'addRowBtn', false)
+          this.optionBox.column.forEach(item => {
+            this.$set(item, 'disabled', true)
+            if (item.prop === "remark") {
+              this.$set(item, 'disabled', false)
+            }
+          })
+          this.optionAgent.column.forEach(item => {
+            this.$set(item, 'disabled', true)
+            if (item.prop === "remark") {
+              this.$set(item, 'disabled', false)
+            }
+          })
+        } else {
+          this.$set(this.optionForm, 'disabled', false)
+          this.findObject(this.optionForm.column, "status").disabled = true
+          this.$set(this.optionBox, 'disabled', false)
+          this.findObject(this.optionBox.column, "status").disabled = true
+          this.$set(this.optionAgent, 'disabled', false)
+          this.findObject(this.optionAgent.column, "status").disabled = true
+        }
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+        this.findObject(this.optionAgent.column, "contacts").change = ({row, column, value}) => {
+          corpByAttnList({corpId: row.agentId}).then(res => {
+            for (let item of res.data.data) {
+              if (item.cname == value) {
+                row.mailbox = item.email
+                row.phone = item.tel
+              }
+            }
+          })
+        }
+        this.findObject(this.optionAgent.column, "agentId").change = ({row, value, column}) => {
+          for (let item of this.$refs.crudAgent.DIC[column.prop]) {
+            if (item.id == value) {
+              corpByAttnList({corpId: value}).then(res => {
+                if (res.data.data.length > 0) {
+                  row.contacts = res.data.data[0].cname
+                  row.mailbox = res.data.data[0].email
+                  row.phone = res.data.data[0].tel
+                }
+              })
+            }
+          }
+        }
+      }
+    },
+    edit(row, index, type = true) {
+      if (!type) {
+        this.$refs.crudAgent.rowCell(row, index)
+      } else {
+        if (row.$cellEdit) {
+          this.$set(row, '$cellEdit', false)
+        } else {
+          this.$set(row, '$cellEdit', true)
+        }
+      }
+    },
+    rowSave(form, done) {
+      done()
+    },
+    rowUpdate(form, index, done) {
+      done()
+    },
+    rowDel(row, index, type) {
+      this.$confirm('是否确认删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (type === 'box') {
+          if (row.id) {
+            boxDelete({id: row.id}).then(res => {
+              this.dataListBox.splice(index, 1);
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              });
+            })
+          } else {
+            this.dataListBox.splice(index, 1);
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+          }
+        } else if (type === 'agent') {
+          if (row.id) {
+            agentDelete({id: row.id}).then(res => {
+              this.dataListAgent.splice(index, 1);
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              });
+            })
+          } else {
+            this.dataListAgent.splice(index, 1);
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+          }
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
+    },
+    backToList() {
+      this.$router.push({
+        path: '/bidingDocument/issueTender/index'
+      });
+      this.$emit('backToList', false)
+    },
+    // 确认中标
+    winningTheBid(row, index) {
+      this.$confirm('是否确认中标?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        confirmWinningTheBid({id: row.id}).then(res => {
+          this.$message({
+            type: 'success',
+            message: '确认中标!'
+          });
+          this.refreshData(this.id)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
+    },
+    // 请核
+    pleaseCheck() {
+      this.$refs['form'].validate((valid, done) => {
+        done()
+        if (valid) {
+          this.$confirm('是否确认请核?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            if (new Date(this.form.deadlineTime) < new Date()) return this.$message.error("截止日期不能小于等于当前日期")
+            let form = {
+              ...this.form,
+              itemsList: this.dataListBox,
+              agentList: this.dataListAgent,
+              contrastList: this.dataListBid
+            }
+            this.fullscreenLoading = true
+            const loading = this.$loading({
+              lock: true,
+              text: '发布中',
+              spinner: 'el-icon-loading',
+              background: 'rgba(255,255,255,0.7)'
+            });
+            saveSaveList(form).then(res => {
+              const data = {
+                id: res.data.data.id,
+                url: '/bidingDocument/issueTender/index',
+                pageStatus: "this.$store.getters.entranceXsStatus"
+              }
+              confirmPleaseCheck(data).then(res => {
+                this.fullscreenLoading = false
+                this.$message({
+                  type: 'success',
+                  message: '请核成功!'
+                });
+                loading.close();
+                this.refreshData(this.form.id)
+              })
+            }).catch(() => {
+              loading.close();
+              this.fullscreenLoading = false;
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消'
+            });
+          });
+        } else {
+          done()
+        }
+      })
+    },
+    // 复制新增
+    copyNew() {
+      this.$confirm('是否确认复制新增?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.form.status = 0
+        this.form.id = ''
+        this.dataListBid = []
+        this.dataListBox.forEach(item => item.id = '')
+        this.dataListAgent.forEach(item => item.id = '')
+        this.$set(this.optionForm, 'disabled', false)
+        this.$set(this.optionBox, 'addRowBtn', true)
+        this.$set(this.optionAgent, 'addRowBtn', true)
+        this.optionBox.column.forEach(item => {
+          this.$set(item, 'disabled', false)
+        })
+        this.optionAgent.column.forEach(item => {
+          this.$set(item, 'disabled', false)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
+    },
+    // 作废
+    toVoid() {
+      this.$confirm('是否确认作废?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        confirmVoid({id: this.form.id}).then(res => {
+          this.$message({
+            type: 'success',
+            message: '作废成功!'
+          });
+          this.refreshData(this.form.id)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
+    },
+    // 发布
+    release() {
+      this.$confirm('是否确认发布?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: '发布中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(255,255,255,0.7)'
+        });
+        confirmRelease({id: this.form.id}).then(res => {
+          loading.close();
+          this.$message({
+            type: 'success',
+            message: '发布成功!'
+          });
+          this.refreshData(this.form.id)
+        }).catch(() => {
+          loading.close();
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
+    },
+    // 保存
+    storage() {
+      this.$refs['form'].validate((valid, done) => {
+        done()
+        if (valid) {
+          let form = {
+            ...this.form,
+            itemsList: this.dataListBox,
+            agentList: this.dataListAgent,
+            contrastList: this.dataListBid
+          }
+          this.fullscreenLoading = true
+          saveSaveList(form).then(res => {
+            this.refreshData(res.data.data.id)
+          }).finally(() => {
+            this.fullscreenLoading = false
+          })
+        }
+      })
+    },
+    refreshData(id) {
+      let ids = ''
+      if (id) {
+        ids = id
+      } else {
+        ids = this.form.id
+      }
+      this.fullscreenLoading = true
+      detailDelegationList({id: ids}).then(res => {
+        this.form = res.data.data
+        this.dataListBox = this.form.itemsList
+        this.dataListAgent = this.form.agentList
+        this.dataListBid = this.form.contrastList
+        delete this.form.itemsList
+        delete this.form.agentList
+        delete this.form.contrastList
+        this.fullscreenLoading = false
+      })
+    },
+  }
 }
 </script>
 

+ 25 - 0
src/views/businessManagement/deliveryNotice/configuration/mainList.json

@@ -233,6 +233,31 @@
       "index": 18,
       "width": 100,
       "overHidden": true
+    },{
+      "label": "是否生成凭证",
+      "prop": "generate",
+      "search": true,
+      "type":"select",
+      "dicData": [
+        {
+          "label": "已生成",
+          "value": "1"
+        },
+        {
+          "label": "未生成",
+          "value": "0"
+        }
+      ],
+      "index": 19,
+      "width": 100,
+      "overHidden": true
+    },{
+      "label": "凭证号",
+      "prop": "voucherNo",
+      "search": true,
+      "index": 20,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

+ 30 - 4
src/views/businessManagement/deliveryNotice/index.vue

@@ -12,11 +12,11 @@
           <el-button type="info" :size="size" icon="el-icon-printer" :loading="exportLoading" @click.stop="statement">
             报表打印</el-button>
           <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
+          <el-button type="danger" size="small" icon="el-icon-edit-outline" :disabled="!generateVoucher" @click="submitCredentials">生成凭证</el-button>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
-              scope.row.orgOrderNo
-          }}</span>
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">
+            {{scope.row.orgOrderNo}}</span>
         </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>
@@ -67,12 +67,13 @@
 
 <script>
 import option from "./configuration/mainList.json";
-import { customerList, typeSave, deleteDetails } from "@/api/basicData/deliveryNotice"
+import {customerList, typeSave, deleteDetails, takeDeliveryBatch} from "@/api/basicData/deliveryNotice"
 import detailPage from "./detailsPageEdit";
 import { defaultDate } from "@/util/date";
 import reportDialog from "@/components/report-dialog/main";
 import { gainUser } from "@/api/basicData/customerInquiry";
 import {getToken} from "@/util/auth";
+import da from "element-ui/src/locale/lang/da";
 
 export default {
   name: "customerInformation",
@@ -110,6 +111,7 @@ export default {
       },
       // 非单个禁用
       single: true,
+      generateVoucher: false,
       // 非多个禁用
       multiple: true,
       selection: [],
@@ -328,6 +330,11 @@ export default {
     selectionChange(list) {
       this.selection = list;
       this.single = list.length !== 1;
+      if (list.length === 0){
+        this.generateVoucher = false
+      }else {
+        this.generateVoucher = list.findIndex(item => item.deliveryStatus == "已到货") !== -1
+      }
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
@@ -444,6 +451,25 @@ export default {
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
+    submitCredentials(){
+      this.$confirm('是否确认生成凭证?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let data = []
+        for (let item of this.selection){
+          data.push(item.id)
+        }
+        takeDeliveryBatch(data.join(",")).then(res=>{
+          this.$message({
+            type: 'success',
+            message: '生成成功!'
+          });
+          this.onLoad(this.page, this.search)
+        })
+      })
+    },
     statement() {
       this.statementData = { ...this.search }
       if (this.statementData.createTime && this.statementData.createTime != '') {

+ 57 - 58
src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -5,10 +5,6 @@
         <el-col :span="4">
           <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" style="height:73vh;"
                      @save="corpTypeVisible = true">
-            <template slot="addBtn">
-              <i class="el-icon-setting" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
-                 @click="corpTypeVisible = true"></i>
-            </template>
           </avue-tree>
         </el-col>
         <el-col :span="20">
@@ -75,7 +71,8 @@ import {
   getList,
   submit,
   batchOperationProductLaunch,
-  getDetail
+  getDetail,
+  listAll
 } from "@/api/tirePartsMall/basicData/listingManagement/index.js";
 import {getToken} from "@/util/auth";
 
@@ -125,8 +122,8 @@ export default {
         size: "small",
         props: {
           labelText: "标题",
-          label: "title",
-          value: "value",
+          label: "cname",
+          value: "id",
         }
       },
       excelBox: false,
@@ -206,66 +203,68 @@ export default {
             value: 0
           }]
         }, {
+          label: "品牌",
+          prop: "brandName",
+          overHidden: true,
+        }, {
           label: "售价1",
           prop: "priceOne",
           hide: true,
           showColumn: false,
           overHidden: true,
-        },
-          {
-            label: "售价2",
-            prop: "priceTwo",
-            hide: true,
-            showColumn: false,
-            overHidden: true,
-          },
-          {
-            label: "售价3",
-            prop: "priceThree",
-            hide: true,
-            showColumn: false,
-            overHidden: true,
-          },
-          {
-            label: "售价4",
-            prop: "priceFour",
-            hide: true,
-            showColumn: false,
-            overHidden: true,
-          },
-          {
-            label: "共享公司",
-            prop: "sharedCompany",
-            search: true,
-            overHidden: true,
-            multiple: true,
-            tags: true,
-            type: 'select',
-            props: {
-              label: 'fullName',
-              value: 'id'
-            },
-            dicUrl: '/api/blade-system/dept/deptList'
+        }, {
+          label: "售价2",
+          prop: "priceTwo",
+          hide: true,
+          showColumn: false,
+          overHidden: true,
+        }, {
+          label: "售价3",
+          prop: "priceThree",
+          hide: true,
+          showColumn: false,
+          overHidden: true,
+        }, {
+          label: "售价4",
+          prop: "priceFour",
+          hide: true,
+          showColumn: false,
+          overHidden: true,
+        }, {
+          label: "共享公司",
+          prop: "sharedCompany",
+          search: true,
+          overHidden: true,
+          multiple: true,
+          tags: true,
+          type: 'select',
+          props: {
+            label: 'fullName',
+            value: 'id'
           },
-          {
-            label: "详情附件",
-            prop: "filesList",
-            hide: true,
-            showColumn: false,
-            overHidden: true,
-            span: 24,
-          }, {
-            label: "商品详情",
-            prop: "detailsText",
-            hide: true,
-            span: 24,
-            showColumn: false,
-            overHidden: true,
-          }]
+          dicUrl: '/api/blade-system/dept/deptList'
+        }, {
+          label: "详情附件",
+          prop: "filesList",
+          hide: true,
+          showColumn: false,
+          overHidden: true,
+          span: 24,
+        }, {
+          label: "商品详情",
+          prop: "detailsText",
+          hide: true,
+          span: 24,
+          showColumn: false,
+          overHidden: true,
+        }]
       }
     }
   },
   activated() {
+    listAll().then(res=>{
+      this.treeData = res.data.data
+    })
     this.onLoad(this.page, this.search)
   },
   async created() {
@@ -294,7 +293,7 @@ export default {
       done();
     },
     nodeClick(data) {
-      this.search.corpsTypeId = data.value
+      this.search.brandId = data.id
       this.page.currentPage = 1;
       this.onLoad(this.page, this.search);
     },

+ 61 - 60
src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -5,10 +5,6 @@
         <el-col :span="4">
           <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" style="height:73vh;"
                      @save="corpTypeVisible = true">
-            <template slot="addBtn">
-              <i class="el-icon-setting" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
-                 @click="corpTypeVisible = true"></i>
-            </template>
           </avue-tree>
         </el-col>
         <el-col :span="20">
@@ -74,7 +70,7 @@ import {
   getList,
   submit,
   batchOperationProductLaunch,
-  getDetail
+  getDetail, listAll
 } from "@/api/tirePartsMall/basicData/listingManagement/index.js";
 import {getToken} from "@/util/auth";
 import fa from "element-ui/src/locale/lang/fa";
@@ -125,8 +121,8 @@ export default {
         size: "small",
         props: {
           labelText: "标题",
-          label: "title",
-          value: "value",
+          label: "cname",
+          value: "id",
         }
       },
       excelBox: false,
@@ -206,68 +202,73 @@ export default {
             value: 0
           }]
         }, {
+          label: "品牌",
+          prop: "brandName",
+          overHidden: true,
+        }, {
           label: "售价1",
           prop: "priceOne",
           hide: true,
           showColumn: false,
           overHidden: true,
-        },
-          {
-            label: "售价2",
-            prop: "priceTwo",
-            hide: true,
-            showColumn: false,
-            overHidden: true,
-          },
-          {
-            label: "售价3",
-            prop: "priceThree",
-            hide: true,
-            showColumn: false,
-            overHidden: true,
+        }, {
+          label: "售价2",
+          prop: "priceTwo",
+          hide: true,
+          showColumn: false,
+          overHidden: true,
+        }, {
+          label: "售价3",
+          prop: "priceThree",
+          hide: true,
+          showColumn: false,
+          overHidden: true,
+        }, {
+          label: "售价4",
+          prop: "priceFour",
+          hide: true,
+          showColumn: false,
+          overHidden: true,
+        }, {
+          label: "共享成本",
+          prop: "shareCost",
+          overHidden: true,
+        }, {
+          label: "来源公司",
+          prop: "sourceCompanyId",
+          hide: true,
+          search: true,
+          showColumn: false,
+          display: false,
+          overHidden: true,
+          type: 'select',
+          props: {
+            label: 'fullName',
+            value: 'id'
           },
-          {
-            label: "售价4",
-            prop: "priceFour",
-            hide: true,
-            showColumn: false,
-            overHidden: true,
-          }, {
-            label: "来源公司",
-            prop: "sourceCompanyId",
-            // hide: true,
-            search: true,
-            // showColumn: false,
-            display: false,
-            overHidden: true,
-            type: 'select',
-            props: {
-              label: 'fullName',
-              value: 'id'
-            },
-            dicUrl: '/api/blade-system/dept/top-list'
-          }
-          // ,
-          // {
-          //   label: "详情附件",
-          //   prop: "filesList",
-          //   hide: true,
-          //   showColumn: false,
-          //   overHidden: true,
-          //   span: 24,
-          // }, {
-          //   label: "商品详情",
-          //   prop: "detailsText",
-          //   hide: true,
-          //   span: 24,
-          //   showColumn: false,
-          //   overHidden: true,
-          // }
-        ]
+          dicUrl: '/api/blade-system/dept/top-list'
+        }, {
+          label: "详情附件",
+          prop: "filesList",
+          hide: true,
+          showColumn: false,
+          overHidden: true,
+          span: 24,
+        }, {
+          label: "商品详情",
+          prop: "detailsText",
+          hide: true,
+          span: 24,
+          showColumn: false,
+          overHidden: true,
+        }]
       }
     }
   },
   activated() {
+    listAll().then(res=>{
+      this.treeData = res.data.data
+    })
     this.onLoad(this.page, this.search)
   },
   async created() {
@@ -296,7 +297,7 @@ export default {
       done();
     },
     nodeClick(data) {
-      this.search.corpsTypeId = data.value
+      this.search.brandId = data.id
       this.page.currentPage = 1;
       this.onLoad(this.page, this.search);
     },

+ 31 - 10
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -32,7 +32,7 @@
       </trade-card>
       <trade-card title="明细信息">
         <el-tabs v-model="activeName" type="card">
-          <el-tab-pane label="库明细" name="sale_detail">
+          <el-tab-pane label="库明细" name="sale_detail">
             <avue-crud :option="optionContacts" v-model="formContacts" ref="formContacts" :data="form.shipItemsList"
                        :key="key"
                        @row-save="rowSave"
@@ -53,7 +53,7 @@
             </avue-crud>
           </el-tab-pane>
           <el-tab-pane label="订单信息" name="payment_details">
-            <avue-crud :option="optionPaymentDetails" v-model="formContacts" ref="payment_details"
+            <avue-crud :option="optionPaymentDetails" ref="payment_details"
                        :data="form.shipVOList"
                        :key="key"
                        @resetColumn="resetColumnTwo('payment_details','optionPaymentDetails','optionPaymentDetailsBack',274.2)"
@@ -61,7 +61,7 @@
             </avue-crud>
           </el-tab-pane>
           <el-tab-pane label="历史记录" name="outbound_records">
-            <avue-crud :option="optionOutboundRecords" v-model="formContacts" ref="outbound_records"
+            <avue-crud :option="optionOutboundRecords" ref="outbound_records"
                        :data="form.historyList"
                        :key="key"
                        @resetColumn="resetColumnTwo('outbound_records','optionOutboundRecords','optionOutboundRecordsBack',274.3)"
@@ -76,7 +76,13 @@
 
 <script>
 
-import {getDetails, tradingBox, submit, warehousingComplete} from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
+import {
+  getDetails,
+  tradingBox,
+  submit,
+  warehousingComplete,
+  goodsDetail
+} from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 import {dateFormat} from "@/util/date";
 
 export default {
@@ -213,10 +219,6 @@ export default {
         dialogTop: 25,
         dialogWidth: "80%",
         column: [{
-          label: '物料编码',
-          prop: 'goodsNo',
-          width: 100
-        }, {
           label: '商品名称',
           prop: 'goodsId',
           width: 200,
@@ -229,6 +231,10 @@ export default {
           },
           dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
         }, {
+          label: '物料编码',
+          prop: 'goodsNo',
+          width: 100
+        }, {
           label: "品牌",
           prop: 'brandId',
           width: 100,
@@ -281,11 +287,16 @@ export default {
         }, {
           label: "入库数量",
           prop: "goodsNum",
-          ovrHidden: true
+          ovrHidden: true,
         }, {
           label: "实际数量",
           prop: "sendNum",
           overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: "备注",
           prop: "remarks",
@@ -404,6 +415,16 @@ export default {
   },
   async created() {
     this.optionContacts = await this.getColumnData(this.getColumnName(274.1), this.optionContactsBack);
+    this.findObject(this.optionContacts.column, "goodsId").change = ({value, column}) => {
+      goodsDetail({id: value}).then(res => {
+        this.formContacts.goodsNo = res.data.data.code
+        this.formContacts.brandId = res.data.data.brandId
+        this.formContacts.propertyName = res.data.data.specificationAndModel
+        this.formContacts.pattern = res.data.data.brandItem
+        this.formContacts.goodsDescription = res.data.data.goodsDescription
+        this.formContacts.units = res.data.data.unit
+      })
+    }
     this.optionPaymentDetails = await this.getColumnData(this.getColumnName(274.2), this.optionPaymentDetailsBack);
     this.optionOutboundRecords = await this.getColumnData(this.getColumnName(274.3), this.optionOutboundRecordsBack);
     this.key++
@@ -439,7 +460,7 @@ export default {
     },
     //修改提交触发
     editCustomer() {
-      if (this.form.shipItemsList.length == 0){
+      if (this.form.shipItemsList.length == 0) {
         return this.$message.warning('请明细不能为空')
       }
       this.$refs["form"].validate((valid, done) => {

+ 70 - 28
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -242,9 +242,41 @@ export default {
         menuWidth: 140,
         dialogTop: 25,
         dialogWidth: "80%",
+        // summaryText: "合计",
+        // showSummary: true,
+        // sumColumnList:[{
+        //   name: "goodsNum",
+        //   type: "sum",
+        //   decimals: 2
+        // },{
+        //   name: "sendNum",
+        //   type: "sum",
+        //   decimals: 2
+        // },{
+        //   name: "profit",
+        //   type: "sum",
+        //   decimals: 2
+        // },{
+        //   name: "subTotalMoney",
+        //   type: "sum",
+        //   decimals: 2
+        // },{
+        //   name: "thisAmount",
+        //   type: "sum",
+        //   decimals: 2
+        // },{
+        //   name: "costprie",
+        //   type: "sum",
+        //   decimals: 2
+        // },{
+        //   name: "grossProfit",
+        //   type: "sum",
+        //   decimals: 2
+        // }],
         column: [{
           label: '物料编码',
           prop: 'goodsNo',
+          overHidden: true,
           width: 100
         }, {
           label: '商品名称',
@@ -271,18 +303,22 @@ export default {
         }, {
           label: '规格型号',
           prop: 'propertyName',
+          overHidden: true,
           width: 100
         }, {
           label: '花纹',
           prop: 'pattern',
+          overHidden: true,
           width: 100
         }, {
           label: '商品描述',
           prop: 'goodsDescription',
+          overHidden: true,
           width: 100
         }, {
           label: '数量',
           prop: 'goodsNum',
+          overHidden: true,
           width: 100
         }, {
           label: '单位',
@@ -293,34 +329,49 @@ export default {
             value: "dictValue"
           },
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit",
+          overHidden: true,
+          width: 100
+        }, {
+          label: '批次号',
+          prop: 'dot',
+          overHidden: true,
           width: 100
         }, {
           label: '价格',
           prop: 'price',
+          overHidden: true,
           width: 100
         }, {
           label: '发货数量',
           prop: 'sendNum',
+          overHidden: true,
           width: 100
         }, {
-          label: '利润',
-          prop: 'profit',
+          label: '毛利',
+          prop: 'grossProfit',
+          overHidden: true,
           width: 100
-        }, {
+        }
+        // , {
+        //   label: '利润',
+        //   prop: 'profit',
+        //   overHidden: true,
+        //   width: 100
+        // }
+        , {
           label: '小计',
           prop: 'subTotalMoney',
+          overHidden: true,
           width: 100
         }, {
           label: '返利',
           prop: 'thisAmount',
+          overHidden: true,
           width: 100
         }, {
           label: '成本',
           prop: 'costprie',
-          width: 100
-        }, {
-          label: '毛利',
-          prop: 'grossProfit',
+          overHidden: true,
           width: 100
         }]
       },
@@ -342,20 +393,16 @@ export default {
         dialogWidth: "80%",
         column: [{
           label: '支付编号',
-          prop: 'paymentNumber',
-          cell: true
+          prop: 'paymentNumber'
         }, {
           label: '金额',
-          prop: 'amount',
-          cell: true
+          prop: 'amount'
         }, {
           label: '类型',
-          prop: 'paymentType',
-          cell: true
+          prop: 'paymentType'
         }, {
           label: '支付时间',
-          prop: 'paymentTime',
-          cell: true
+          prop: 'paymentTime'
         }]
       },
       optionOutboundRecords: {},
@@ -376,24 +423,19 @@ export default {
         dialogWidth: "80%",
         column: [{
           label: '出库单号',
-          prop: 'attn',
-          cell: true
+          prop: 'billno'
         }, {
           label: '来源单号',
-          prop: 'contractNumber',
-          cell: true
+          prop: 'ordNo'
         }, {
           label: '数量',
-          prop: 'accountsAmount',
-          cell: true
+          prop: 'goodsTotalNum'
         }, {
           label: '状态',
-          prop: 'settlmentAmount',
-          cell: true
+          prop: 'statusName'
         }, {
           label: '业务时间',
-          prop: 'settlmentAmount',
-          cell: true
+          prop: 'createTime'
         }]
       }
     }
@@ -405,7 +447,7 @@ export default {
   async created() {
     this.optionContacts = await this.getColumnData(this.getColumnName(269.1), this.optionContactsBack);
     this.optionPaymentDetails = await this.getColumnData(this.getColumnName(269.2), this.optionPaymentDetailsBack);
-    this.optionOutboundRecords = await this.getColumnData(this.getColumnName(269.2), this.optionOutboundRecordsBack);
+    this.optionOutboundRecords = await this.getColumnData(this.getColumnName(269.3), this.optionOutboundRecordsBack);
     this.key++
     if (this.onLoad.id && this.detailData.id) {
       this.refresh(this.onLoad.id, true)
@@ -449,6 +491,7 @@ export default {
             ...this.form
           }).then(res => {
             this.$message.success("保存成功");
+            this.refresh(res.data.data.id)
             loading.close();
           }).finally(() => {
             loading.close();
@@ -488,8 +531,7 @@ export default {
             this.$message.success("操作成功!");
           }
         }
-      )
-      ;
+      );
     },
     rowSave(form, done, loading) {
       done(form)

+ 4 - 0
vue.config.js

@@ -32,7 +32,11 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
+<<<<<<< HEAD
         target: 'http://192.168.8.108:1080',
+=======
+        target: 'http://192.168.0.106:1080',
+>>>>>>> 98ca32bc20041f0f4fb46a8e3e94175ffa6ff9b7
         // 打包地址
         // target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名