Quellcode durchsuchen

供货商 表字段变更

shish vor 5 Jahren
Ursprung
Commit
ac08f6ade0

+ 1 - 1
ghs/src/views/order/add.vue

@@ -142,7 +142,7 @@
     <div class="bottom_input">
     <div class="bottom_input">
       <el-form ref="form" label-width="80px" style="display: inline-block">
       <el-form ref="form" label-width="80px" style="display: inline-block">
         <el-form-item label="花材">
         <el-form-item label="花材">
-        <el-input style="width: 200px" @keyup.enter.native="enterSeekFun()" type="text" ref="commodityInput" v-model="seekVal"></el-input></el-form-item>
+        <el-input style="width: 200px" @keyup.enter.native="enterSeekFun()" placeholder="请输入名称,支持拼音首字母,按Esc取消" type="text" ref="commodityInput" v-model="seekVal"></el-input></el-form-item>
       </el-form>
       </el-form>
       <div style="display: inline-block;" class="allPrice">总金额: {{ totalMoney.toFixed(2) }}</div>
       <div style="display: inline-block;" class="allPrice">总金额: {{ totalMoney.toFixed(2) }}</div>
       <div style="display: inline-block;" class="allPrice">总数量: {{tableData.length}}</div>
       <div style="display: inline-block;" class="allPrice">总数量: {{tableData.length}}</div>

+ 3 - 3
ghsApp/src/pagesPurchase/details.vue

@@ -192,7 +192,7 @@ export default {
 				localCharge: "",
 				localCharge: "",
 
 
 				entryTime: "",
 				entryTime: "",
-				supplierId: null
+				ghsId: null
 			},
 			},
 			showCustomer: false,
 			showCustomer: false,
 			detailsInfo: {}
 			detailsInfo: {}
@@ -280,7 +280,7 @@ export default {
 		changeCustomerFn(e) {
 		changeCustomerFn(e) {
 			console.log("changeCustomerFn", e);
 			console.log("changeCustomerFn", e);
 			this.supplier = e;
 			this.supplier = e;
-			this.form.supplierId = e.id;
+			this.form.ghsId = e.id;
 			// this.form.address = e.address;
 			// this.form.address = e.address;
 			// this.form.lat = e.location.lat;
 			// this.form.lat = e.location.lat;
 			// this.form.long = e.location.lng;
 			// this.form.long = e.location.lng;
@@ -312,7 +312,7 @@ export default {
 				if (!this.getMerchantInfo) {
 				if (!this.getMerchantInfo) {
 					await this.initMerchantInfo();
 					await this.initMerchantInfo();
 				}
 				}
-				// formData.supplierId = this.getMerchantInfo.id;
+				// formData.ghsId = this.getMerchantInfo.id;
 				await createPurchaseOrderApi(formData);
 				await createPurchaseOrderApi(formData);
 				this.$msg("确认成功!");
 				this.$msg("确认成功!");
 
 

+ 0 - 5
hd/src/views/home.vue

@@ -196,11 +196,6 @@ export default {
 					icon: 'iconshangpinguanli',
 					icon: 'iconshangpinguanli',
 					url: '/goods/list'
 					url: '/goods/list'
 				},
 				},
-				{
-					name: '老带新',
-					icon: 'iconyaoqingyouli',
-					url: '/invite/list'
-				},
 				{
 				{
 					name: '广告管理',
 					name: '广告管理',
 					icon: 'iconguanggao',
 					icon: 'iconguanggao',

+ 1 - 1
hdApp/src/admin/billing/affirmGhs.vue

@@ -423,7 +423,7 @@ export default {
 				sendCost:this.form.sendCost,
 				sendCost:this.form.sendCost,
 				remark:this.remark,
 				remark:this.remark,
 				product:JSON.stringify(product),
 				product:JSON.stringify(product),
-				supplierId:this.ghsMsg.id,
+				ghsId:this.ghsMsg.id,
 			}
 			}
 			let self = this;
 			let self = this;
 			uni.showModal({
 			uni.showModal({

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

@@ -225,7 +225,7 @@ export default {
 				localCharge: "",
 				localCharge: "",
 
 
 				entryTime: "",
 				entryTime: "",
-				supplierId: null
+				ghsId: null
 			},
 			},
 			showCustomer: false,
 			showCustomer: false,
 			detailsInfo: {}
 			detailsInfo: {}
@@ -342,7 +342,7 @@ export default {
 				if (!this.getMerchantInfo) {
 				if (!this.getMerchantInfo) {
 					await this.initMerchantInfo();
 					await this.initMerchantInfo();
 				}
 				}
-				formData.supplierId = this.getMerchantInfo.id;
+				formData.ghsId = this.getMerchantInfo.id;
 				await createPurchaseOrderApi(formData);
 				await createPurchaseOrderApi(formData);
 				this.$msg("确认成功!");
 				this.$msg("确认成功!");
 
 

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

@@ -49,7 +49,7 @@
                 class="btn_entrance"
                 class="btn_entrance"
                 @click.stop="enter(item)"
                 @click.stop="enter(item)"
               >
               >
-                进店
+                采购
               </view>
               </view>
             </view>
             </view>
           </view>
           </view>

+ 7 - 7
hdApp/src/pagesPurchase/orderItem.vue

@@ -5,10 +5,10 @@
         <image
         <image
           class="icon"
           class="icon"
           :src="info.supplierAvatar"
           :src="info.supplierAvatar"
-          alt="商品图"
+          alt=""
         />
         />
         <text class="name">
         <text class="name">
-          {{ info.supplierName || '纯彩花艺'}}
+          {{ info.supplierName}}
         </text>
         </text>
       </view>
       </view>
       <view class="status">{{ getStatusName }} </view>
       <view class="status">{{ getStatusName }} </view>
@@ -19,19 +19,19 @@
     >
     >
       <view class="item-info">
       <view class="item-info">
         <view class="info-row">
         <view class="info-row">
-          <text class="info-label"> 进货日期: </text>
+          <text class="info-label"> 日期:</text>
           <text class="info-value">{{ info.addTime }} </text>
           <text class="info-value">{{ info.addTime }} </text>
         </view>
         </view>
         <view class="info-row">
         <view class="info-row">
-          <text class="info-label"> 单号: </text>
+          <text class="info-label"> 单号</text>
           <text class="info-value">{{ info.orderSn }} </text>
           <text class="info-value">{{ info.orderSn }} </text>
         </view>
         </view>
         <view class="info-row">
         <view class="info-row">
-          <text class="info-label"> 业务员: </text>
-          <text class="info-value">{{ info.adminName }} </text>
+          <text class="info-label"> 采购:</text>
+          <text class="info-value">{{ info.shopAdminName }} </text>
         </view>
         </view>
         <view class="info-row">
         <view class="info-row">
-          <text class="info-label"> 数量: </text>
+          <text class="info-label"> 数量</text>
           <text class="info-value">{{ info.bigNum }} / {{info.smallNum}}</text>
           <text class="info-value">{{ info.bigNum }} / {{info.smallNum}}</text>
         </view>
         </view>
       </view>
       </view>

+ 1 - 1
pt/src/saas/shop/list.vue

@@ -276,7 +276,7 @@ export default {
   methods: {
   methods: {
     bindGhsConfirmFn (item) {
     bindGhsConfirmFn (item) {
 
 
-      GhsService.bindGhs({ sjId: this.selectSjId, ghsSjId: item.id }).then(res => {
+      GhsService.bindGhs({ ownSjId: this.selectSjId, sjId: item.id }).then(res => {
         this.$message.success('操作成功!');
         this.$message.success('操作成功!');
         this.ghsModal = false;
         this.ghsModal = false;
       });
       });