轮胎配件/标书/达沃特

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({

src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -12,6 +12,7 @@
             </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">取消发布

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
     }
   ]
 }

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 != '') {

src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -211,59 +211,57 @@ export default {
           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,
+        }]
       }
     }
   },

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,44 @@ export default {
             value: "dictValue"
           },
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit",
+          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
         }]
       },
@@ -449,6 +495,7 @@ export default {
             ...this.form
           }).then(res => {
             this.$message.success("保存成功");
+            this.refresh(res.data.data.id)
             loading.close();
           }).finally(() => {
             loading.close();
@@ -488,8 +535,7 @@ export default {
             this.$message.success("操作成功!");
           }
         }
-      )
-      ;
+      );
     },
     rowSave(form, done, loading) {
       done(form)

vue.config.js

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