Merge branch 'feature/pyh_销售采购管理优化'

src/api/dataDictionary.js

@@ -18,7 +18,7 @@ export function getType(data) {
 
 export function getDataDictionaryExport(data, name) {
   return postBlob({
-    url: '/dict/page/export',
+    url: '/dictCompany/pageExport',
     data,
     name
   })

src/views/mallManagement/goods/goods_add/index.vue

@@ -217,14 +217,14 @@
                 <el-input size="small" v-model="scope.row.innerShareAmount"></el-input>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="上架库存" prop="stockNum" min-width="120">
+            <el-table-column align="center" label="商品库存" prop="stockNum" min-width="120">
               <template slot-scope="scope">
                 <el-input size="small" v-model="scope.row.stockNum"></el-input>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="当前库存" prop="stockQty" min-width="120">
+            <el-table-column align="center" label="仓库库存" prop="stockQty" min-width="120">
               <template slot-scope="scope">
-                {{scope.row.stockQty}}
+                {{scope.row.stockQty || 0}}
               </template>
             </el-table-column>
             <el-table-column align="center" label="规格图片" prop="imgUrl" min-width="120">

src/views/mallManagement/goods/goods_index/index.vue

@@ -139,13 +139,19 @@
               <i class="el-icon-edit pointer" @click="editData('innerSharePercent', scope.row)"></i>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="库存" prop="stockNum" min-width="110" sortable>
+          <el-table-column align="center" label="商品库存" prop="stockNum" min-width="110" sortable>
             <template slot-scope="scope">
               <!-- {{ scope.row.stockNum }} -->
               <span style="margin-right: 10px">{{ scope.row.stockNum }}</span>
               <i class="el-icon-edit pointer" @click="editData('stockNum', scope.row)"></i>
             </template>
           </el-table-column>
+		  <el-table-column align="center" label="仓库库存" prop="allStockNum" min-width="110" sortable>
+			  <template slot-scope="scope">
+			    <span style="margin-right: 10px">{{ scope.row.allStockNum || 0 }}</span>
+			    <i class="el-icon-s-data pointer" @click="editData('stockNum', scope.row)"></i>
+			  </template>
+		  </el-table-column>
           <el-table-column align="center" label="销量" prop="soldNum" min-width="110" sortable></el-table-column>
           <el-table-column align="center" label="排序" prop="sortNum" min-width="110" sortable>
             <template slot-scope="scope">
@@ -231,11 +237,16 @@
             <el-input v-model="scope.row.innerSharePercent" :disabled="editType !== 'innerSharePercent'"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="库存" prop="stockNum" min-width="120">
+        <el-table-column align="center" label="商品库存" prop="stockNum" min-width="120">
           <template slot-scope="scope">
             <el-input v-model="scope.row.stockNum" :disabled="editType != 'stockNum'"></el-input>
           </template>
         </el-table-column>
+		<el-table-column align="center" label="仓库库存" prop="goodsMaterialStock">
+			<template slot-scope="scope">
+			  {{scope.row.goodsMaterialStock || 0}}
+			</template>
+		</el-table-column>
         <el-table-column align="center" label="物料编号" prop="goodsCode" min-width="120">
           <template slot-scope="scope">
             <el-input v-model="scope.row.goodsCode"></el-input>
@@ -493,7 +504,7 @@ export default {
         sharePercent: '佣金比例',
         innerShareAmount: '内部分销金额',
         innerSharePercent: '内部佣金比例',
-        stockNum: '库存',
+        stockNum: '商品库存',
         sortNum: '排序'
       }
       await getGoodsDetail({goodsId: item.goodsId}).then(res => {

src/views/mallManagement/goods/newclassify_index/index.vue

@@ -151,12 +151,20 @@ export default {
 			disposition: {
 				btnType: 'text',
 				click: ({ row, index, column }) => {
+					// this.$router.push({
+					// 	name: "newclassify_set",
+					// 	query: {
+					// 		item: row
+					// 	},
+					// });
 					this.$router.push({
-						name: "newclassify_set",
-						query: {
-							item: row
+						name: 'newclassify_set',
+						params: {
+							pageName: row.goodsNewsCategoryId,
+							pageType: '-',
+							pageCode: JSON.stringify(row)
 						},
-					});
+					})
 				}
 			},
 			edit: {  

src/views/mallManagement/goods/newclassify_set/index.vue

@@ -212,18 +212,20 @@ export default {
       defaultProps: {
         children: 'children',
         label: 'name'
-      }
+      },
     };
   },
   computed: {
 
   },
   created() {
-    const { item } = this.$route.query;
-    this.mainForm.mainTitle = item.mainTitle;
-    this.mainForm.subtitle = item.subTitle;
-    this.mainForm.goodsType = item.type;
-    this.objectId = item.goodsNewsCategoryId
+	if(this?.$route?.params?.pageCode){
+		const item = JSON.parse(this?.$route?.params?.pageCode)
+		this.mainForm.mainTitle = item.mainTitle;
+		this.mainForm.subtitle = item.subTitle;
+		this.mainForm.goodsType = item.type;
+		this.objectId = item.goodsNewsCategoryId
+	}
 
     this.getEnterpriseTemplate()
     this.getactivityGoodsDetail()

src/views/mallManagement/order/order_detail/index.vue

@@ -333,6 +333,7 @@
 									<el-table-column prop="mainName" align="center" label="大类"></el-table-column>
 									<el-table-column prop="smallName" align="center" label="小类"></el-table-column>
 									<el-table-column prop="goodsName" align="center" label="商品名称"></el-table-column>
+									<el-table-column prop="goodsMaterialName" align="center" label="物料名称"></el-table-column>
 									<el-table-column prop="goodsMaterialSpecsName" align="center" label="规格型号"></el-table-column>
 									<el-table-column prop="goodsMaterialUnit" align="center" label="单位">
 										<template slot-scope="scope">

src/views/mallManagement/order/order_list/index.vue

@@ -399,6 +399,7 @@
 											<el-table-column prop="mainName" align="center" label="大类"></el-table-column>
 											<el-table-column prop="smallName" align="center" label="小类"></el-table-column>
 											<el-table-column prop="goodsName" align="center" label="商品名称"></el-table-column>
+											<el-table-column prop="goodsMaterialName" align="center" label="物料名称"></el-table-column>
 											<el-table-column prop="goodsMaterialSpecsName" align="center" label="规格型号"></el-table-column>
 											<el-table-column prop="goodsMaterialUnit" align="center" label="单位">
 												<template slot-scope="scope">

src/views/mallManagement/order/order_refund/index.vue

@@ -295,6 +295,7 @@
                       <el-table-column prop="mainName" align="center" label="大类"></el-table-column>
                       <el-table-column prop="smallName" align="center" label="小类"></el-table-column>
                       <el-table-column prop="goodsName" align="center" label="商品名称"></el-table-column>
+					  <el-table-column prop="goodsMaterialName" align="center" label="物料名称"></el-table-column>
                       <el-table-column prop="goodsMaterialSpecsName" align="center" label="规格型号"></el-table-column>
                       <el-table-column prop="goodsMaterialUnit" align="center" label="单位">
                         <template slot-scope="scope">

src/views/mallManagement/order/order_refund_detail/index.vue

@@ -205,6 +205,7 @@
 									<el-table-column prop="mainName" align="center" label="大类"></el-table-column>
 									<el-table-column prop="smallName" align="center" label="小类"></el-table-column>
 									<el-table-column prop="goodsName" align="center" label="商品名称"></el-table-column>
+									<el-table-column prop="goodsMaterialName" align="center" label="物料名称"></el-table-column>
 									<el-table-column prop="goodsMaterialSpecsName" align="center" label="规格型号"></el-table-column>
 									<el-table-column prop="goodsMaterialUnit" align="center" label="单位">
 										<template slot-scope="scope">

src/views/setting/oplog/index.vue

@@ -9,6 +9,7 @@
           
         </div>
         <div class="fr">
+		  <el-input type="text" v-model="screenForm.companyWechatName" @change="getList()" size="small" style="width: 240px;margin-right: 20px;" placeholder="输入商户名称"></el-input>
           <el-select v-model="screenForm.moduleName" placeholder="全部" size="small" style="width: 140px;" @change="getListByScreen">
             <el-option label="选择模块" value=""></el-option>
             <el-option :label="item" :value="item" v-for="(item, index) in moduleList" :key="index"></el-option>
@@ -93,6 +94,7 @@ export default {
       moduleList: null, // 模块列表
       listLoading: true, // 列表加载loading
       screenForm: { // 筛选表单数据
+				companyWechatName: '', // 商户名称
         moduleName: '', // 模块名称
         date: '', // 日期
       },
@@ -110,6 +112,7 @@ export default {
       this.listLoading = true;
 
       let params = {
+		companyWechatName: this.screenForm.companyWechatName,
         moduleName: this.screenForm.moduleName,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',