轮胎配件

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'
+  })
+}

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
+  })
+}

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')
+  }]
 }
 ]

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);
     },

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,6 +202,10 @@ export default {
             value: 0
           }]
         }, {
+          label: "品牌",
+          prop: "brandName",
+          overHidden: true,
+        }, {
           label: "售价1",
           prop: "priceOne",
           hide: true,
@@ -266,6 +266,9 @@ export default {
     }
   },
   activated() {
+    listAll().then(res=>{
+      this.treeData = res.data.data
+    })
     this.onLoad(this.page, this.search)
   },
   async created() {
@@ -294,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);
     },

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

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -332,6 +332,11 @@ export default {
           overHidden: true,
           width: 100
         }, {
+          label: '批次号',
+          prop: 'dot',
+          overHidden: true,
+          width: 100
+        }, {
           label: '价格',
           prop: 'price',
           overHidden: true,
@@ -388,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: {},
@@ -422,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'
         }]
       }
     }
@@ -451,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)

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.0.106: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: {