Sfoglia il codice sorgente

供应商改成供货商

shish 3 anni fa
parent
commit
4aa1b58438

+ 1 - 1
hdApp/src/admin/home/apply.vue

@@ -58,7 +58,7 @@ export default {
             { name: "盘点", img: `${this.$constant.imgUrl}/ghs/home/pandian.png`, url: "/pagesStorehouse/inventory/list",pf:0},
             { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:0},
             { name: "员工业绩", img: `${this.$constant.imgUrl}/ghs/home/icon_ygyj.png`, url: "/admin/staff/achieve",pf:1},
-            { name: "供商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1},
+            { name: "供商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1},
             { name: "采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:1},
             { name: "报损", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
             { name: "拆散", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/part/list",pf:1}

+ 1 - 1
hdApp/src/admin/home/workbench.vue

@@ -176,7 +176,7 @@ export default {
         { name: "制作单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:1},
         { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
-        { name: "供商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1 },
+        { name: "供商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1 },
         { name: "拆散", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/part/list",pf:1},
         { name: "报损", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
         { name: "花材采购", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:1 },

+ 2 - 2
hdApp/src/admin/recharge/renew.vue

@@ -12,7 +12,7 @@
       </view>
       <view>
         <picker @change="startTimeFn" class="tui-input" :range="ghsList" range-key="name" :value="selectIndex">
-          <input type="text" placeholder="请选择供商" class="ghsStyle" disabled v-model="shopName">
+          <input type="text" placeholder="请选择供商" class="ghsStyle" disabled v-model="shopName">
         </picker>
       </view>
       
@@ -75,7 +75,7 @@ export default {
     // 立即充值
     onceRecharge () {
       if(!this.ghsId) {
-        this.$msg('请选择供商')
+        this.$msg('请选择供商')
         return
       }
       rechargeRenewPay({ghsId: this.ghsId}).then(res => {

+ 1 - 1
hdApp/src/admin/stat/cgStat.vue

@@ -13,7 +13,7 @@
 			<view class="space-view ex-table">
 				<block>
 					<t-table :headerBackgroundColor="'#F0F2F6'">
-						<t-tr header><t-th>供商</t-th><t-th>数量</t-th><t-th>金额</t-th><t-th>操作</t-th></t-tr>
+						<t-tr header><t-th>供商</t-th><t-th>数量</t-th><t-th>金额</t-th><t-th>操作</t-th></t-tr>
 						<view v-for="(item, index) in profile" :key="index">
 							<t-tr>
 								<t-td><view>{{item.ghsName}}</view></t-td>

+ 1 - 1
hdApp/src/admin/stat/mayPayStat.vue

@@ -8,7 +8,7 @@
 				<block>
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 
-						<t-tr header><t-th>供商</t-th><t-th>应付款(元)</t-th><t-th>操作</t-th></t-tr>
+						<t-tr header><t-th>供商</t-th><t-th>应付款(元)</t-th><t-th>操作</t-th></t-tr>
 						<t-tr><t-td><view>盛丰</view></t-td><t-td><view>286500.00</view></t-td><t-td><view></view></t-td></t-tr>
 						<t-tr><t-td><view>茗星花卉</view></t-td><t-td><view>170129.00</view></t-td><t-td><view></view></t-td></t-tr>
 						<t-tr><t-td><view>珍情花卉</view></t-td><t-td><view>367111.00</view></t-td><t-td><view></view></t-td></t-tr>

+ 2 - 2
hdApp/src/api/apply/index.js

@@ -1,14 +1,14 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
 /**
- * 邀请供应商(零售、供应商相同)
+ * 邀请供货商(零售、供货商相同)
  * @param {*} name
  */
 export const applyInviteGhsPoster = name => {
 	return https.get("/apply/invite-ghs-poster", { name });
 };
 /**
- * 邀请花店(零售、供商相同)  wangning  2021-6-13
+ * 邀请花店(零售、供商相同)  wangning  2021-6-13
  * @param {*} name
  */
  export const applyInviteHdPoster = name => {

+ 1 - 1
hdApp/src/api/main/index.js

@@ -1,7 +1,7 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
 /** *
- * 商城分享(零售、供商相同) b  wangning  2021-6-12
+ * 商城分享(零售、供商相同) b  wangning  2021-6-12
  */
 export const mainGetMallPoster = data => {
 	return https.get('/main/get-mall-poster', data)

+ 1 - 1
hdApp/src/api/product/index.js

@@ -100,7 +100,7 @@ export const  pxClassDel = data => {
   return https.get("/px-class/del", data);
 };
 /** *
- * 供商花材列表(进店开单) 【采购开单】 
+ * 供商花材列表(进店开单) 【采购开单】 
  */
  export const getGhsProductList = data => {
 	return https.get('/product/ghs-item', data)

+ 2 - 2
hdApp/src/api/purchase/index.js

@@ -26,7 +26,7 @@ export const createPurchaseOrderApi = async data => {
 };
 
 /** *
- * 供商列表
+ * 供商列表
  */
  export const ghsList = async data => {
 	return https.get("/ghs/list", data);
@@ -47,7 +47,7 @@ export const createPurchaseOrderApi = async data => {
 };
 
 /** *
- * 供商详情  
+ * 供商详情  
  */
  export const ghsDetail = async data => {
 	return https.get("/ghs/detail", data);

+ 1 - 1
hdApp/src/mixins/cgProduct.js

@@ -232,7 +232,7 @@ export default {
 				this.customData.smallCount = null
 			}
 		},
-		//采购时请求供商花材
+		//采购时请求供商花材
 		async initGhsData(id,shopId,showAll) {
 			//extendInfo调用时的扩展参数,如shopId
 			try {

+ 2 - 2
hdApp/src/pages.json

@@ -163,7 +163,7 @@
 		{
 			"root": "admin/ghs",
 			"pages": [
-				{ "path": "shop", "style": {"navigationBarTitleText": "供商"}},
+				{ "path": "shop", "style": {"navigationBarTitleText": "供商"}},
 				{ "path": "debtChange", "style": {"navigationBarTitleText": "欠款变动明细"}}
 			]
 		},
@@ -379,7 +379,7 @@
 				{ "path": "gathering", "style": { "navigationBarTitleText": "待结订单", "enablePullDownRefresh": true } },
 				{ "path": "particulars", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": true } },
 				{ "path": "details", "style": { "navigationBarTitleText": "确认订单" } },
-				{ "path": "order", "style": { "navigationBarTitleText": "供商", "enablePullDownRefresh": true } },
+				{ "path": "order", "style": { "navigationBarTitleText": "供商", "enablePullDownRefresh": true } },
 				{ "path": "shopping", "style": { "navigationBarTitleText": "采购", "enablePullDownRefresh": true } },
 				{ "path": "ghsProduct", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "setPsd", "style": { "navigationBarTitleText": "设置密码", "enablePullDownRefresh": true } },

+ 2 - 2
hdApp/src/pagesClient/official/latest-shop.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="latest-content_box">
       <view class="shop-title_box">
-          您访问过的供
+          您访问过的供
       </view>
       <view class="shop-list_box">
           <template v-if="!$util.isEmpty(list)">
@@ -28,7 +28,7 @@
           <view @click="pageTo({
             url:`/pagesClient/official/index?introMerchantId=${this.userInfo.id}&form=2&style=2`
           })" class="des">
-              我是供商,点此 <text>申请开店</text><i class="iconfont iconxiangyou"></i>
+              我是供商,点此 <text>申请开店</text><i class="iconfont iconxiangyou"></i>
           </view>
       </view>
   </view>

+ 2 - 2
hdApp/src/pagesClient/official/result.vue

@@ -27,13 +27,13 @@ export default {
     },
     onLoad () {
 
-      //供商打开小程序分享给客户,客户需要采购进来
+      //供商打开小程序分享给客户,客户需要采购进来
       let ghsCgOption = uni.getStorageSync('ghsCgOption')
       if(ghsCgOption.fromCg){
         this.fromCg = ghsCgOption.fromCg
       }
 
-      //供商打开太阳码分享给客户,客户需要采购进来
+      //供商打开太阳码分享给客户,客户需要采购进来
       let scene = uni.getStorageSync('ghsCgScene')
       if(scene){
         this.scene = scene

+ 1 - 1
hdApp/src/pagesInvite/inviteItem.vue

@@ -6,7 +6,7 @@
 			alt="商品图"
 		/>
 		<view class="item-info">
-			<view class="info-title">{{ info.name }} <text class="ghs-info" v-if="info.style ==2">供商</text></view>
+			<view class="info-title">{{ info.name }} <text class="ghs-info" v-if="info.style ==2">供商</text></view>
 			<view class="info-row">
 				<text class="info-tag">{{ info.adminName }}</text>
 				<text class="info-tag">{{ info.mobile }} </text>

+ 3 - 3
hdApp/src/pagesInvite/inviteShop.vue

@@ -4,9 +4,9 @@
       <image :src="imgUrl" class="img_url"></image>
     </view>
     <view class="intro">
-      <view>1、保存图片分享给供应商,供应商识别并注册</view>
-      <view>2、直接打开分享给供商注册也可以</view>
-      <view>3、奖金分二次发放,供应商注册并审核通过奖励10元,供应商线上营业额达20万元,奖励290元</view>
+      <view>1、保存图片分享给供货商,供货商识别并注册</view>
+      <view>2、直接打开分享给供商注册也可以</view>
+      <view>3、奖金分二次发放,供货商注册并审核通过奖励10元,供货商线上营业额达20万元,奖励290元</view>
       <view>4、只能邀请城市批发商,昆明批发商无法使用</view>
       <view>5、如有疑问,请<text style="color:blue" @click="getCustomService()">点我联系客服</text></view>
     </view>

+ 2 - 2
hdApp/src/pagesPurchase/bookProduct.vue

@@ -391,7 +391,7 @@ export default {
 
 			this.init = false
 
-			//通过供商小程序分享进采购页,注册的客户,注册后引导返回采购页
+			//通过供商小程序分享进采购页,注册的客户,注册后引导返回采购页
 			if(this.option.fromCg && this.option.fromCg == 1){
 				uni.setStorageSync('ghsCgOption', this.option)
 			}
@@ -399,7 +399,7 @@ export default {
 			//扫码采购 shish 20210614
 			if(this.option.scene){
 				
-				//通过供商的太阳码进采购页,注册的客户,注册后引导返回采购页
+				//通过供商的太阳码进采购页,注册的客户,注册后引导返回采购页
 				uni.setStorageSync('ghsCgScene', this.option.scene)
 
 				const scene = decodeURIComponent(this.option.scene);

+ 1 - 1
hdApp/src/pagesPurchase/details.vue

@@ -45,7 +45,7 @@
 				</view>
 				<view class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view class="tui-title ">供商</view>
+						<view class="tui-title ">供商</view>
 						<text>
 							{{ detailsInfo.supplierName || "" }}
 						</text>

+ 2 - 2
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -447,7 +447,7 @@ export default {
 
 			this.init = false
 
-			//通过供商小程序分享进采购页,注册的客户,注册后引导返回采购页
+			//通过供商小程序分享进采购页,注册的客户,注册后引导返回采购页
 			if(this.option.fromCg && this.option.fromCg == 1){
 				uni.setStorageSync('ghsCgOption', this.option)
 			}
@@ -455,7 +455,7 @@ export default {
 			//扫码采购 shish 20210614
 			if(this.option.scene){
 				
-				//通过供商的太阳码进采购页,注册的客户,注册后引导返回采购页
+				//通过供商的太阳码进采购页,注册的客户,注册后引导返回采购页
 				uni.setStorageSync('ghsCgScene', this.option.scene)
 
 				const scene = decodeURIComponent(this.option.scene);

+ 1 - 1
hdApp/src/pagesPurchase/info.vue

@@ -2,7 +2,7 @@
 	<view class="app-content">
 		<view v-if="!$util.isEmpty(detailInfo)" class="info-content_box">
 			<view class="title">
-				供
+				供
 			</view>
 			<view class="address-des_bx content-box">
 				<view>

+ 2 - 2
hdApp/src/pagesPurchase/particulars.vue

@@ -34,13 +34,13 @@ export default {
   onLoad () {
     this.hasInit = true
 
-    //供商打开太阳码分享给客户,客户需要采购进来
+    //供商打开太阳码分享给客户,客户需要采购进来
     let scene = uni.getStorageSync('ghsCgScene')
     if(scene){
       this.ghsCgScene = scene
     }
 
-    //供商打开小程序分享给客户,客户需要采购进来
+    //供商打开小程序分享给客户,客户需要采购进来
     let ghsCgOption = uni.getStorageSync('ghsCgOption')
     if(ghsCgOption.fromCg){
       this.fromCg = ghsCgOption.fromCg

+ 1 - 1
hdApp/src/pagesPurchase/purDetails.vue

@@ -2,7 +2,7 @@
   <view class="app-content">
     <view class="info-content_box">
       <view class="title">
-        供
+        供
       </view>
       <view class="address-des_bx content-box" @click="goToSettle(detailInfo)">
         <view>

+ 1 - 1
hdApp/src/pagesStatistics/business.vue

@@ -26,7 +26,7 @@
 						>
 					</view>
 					<view class="down-item">
-						<text class="label">应付供商款</text>
+						<text class="label">应付供商款</text>
 						<text class="value"
 							><text class="unit">¥</text>{{ baseInfo.mayPay || "0.00" }}</text
 						>