linwenxin 8 bulan lalu
induk
melakukan
562c6eb10b
24 mengubah file dengan 326 tambahan dan 315 penghapusan
  1. 5 5
      src/packageAttachment/pages/applicationParts/applicationPartsForm.vue
  2. 3 3
      src/packageAttachment/pages/applicationParts/confirmOrder.vue
  3. 246 236
      src/packageAttachment/pages/applicationParts/index.nvue
  4. 12 12
      src/packageAttachment/pages/applicationParts/orderPayment.vue
  5. 2 2
      src/packageAttachment/pages/applicationParts/state.vue
  6. 9 9
      src/packageAttachment/pages/applyReturnOfNewPiece/index.vue
  7. 1 1
      src/packageAttachment/pages/beyondInsuranceTransferToSale/card.vue
  8. 1 1
      src/packageAttachment/pages/beyondInsuranceTransferToSale/index.vue
  9. 2 2
      src/packageAttachment/pages/fittingsManagement/index.vue
  10. 1 1
      src/packageAttachment/pages/forwardSaleOrder/card.vue
  11. 2 2
      src/packageAttachment/pages/forwardSaleOrder/details.vue
  12. 1 1
      src/packageAttachment/pages/forwardSaleOrder/index.vue
  13. 1 1
      src/packageAttachment/pages/orderOfSales/card.vue
  14. 3 3
      src/packageAttachment/pages/orderOfSales/details.vue
  15. 1 1
      src/packageAttachment/pages/orderOfSales/index.vue
  16. 1 1
      src/packageAttachment/pages/returnOfNewParts/card.vue
  17. 3 3
      src/packageAttachment/pages/returnOfNewParts/details.vue
  18. 1 1
      src/packageAttachment/pages/returnOfNewParts/index.vue
  19. 1 1
      src/packageAttachment/pages/returnOfOldParts/card.vue
  20. 2 2
      src/packageAttachment/pages/returnOfOldParts/details.vue
  21. 1 1
      src/packageAttachment/pages/returnOfOldParts/index.vue
  22. 4 4
      src/packageAttachment/pages/sparePartsInventory/choosingAccessories.vue
  23. 3 3
      src/packageAttachment/pages/sparePartsInventory/index.vue
  24. 20 19
      src/packageAttachment/pages/sparePartsInventory/mixins/getData.js

+ 5 - 5
src/packageAttachment/pages/applicationParts/applicationPartsForm.vue

@@ -12,7 +12,7 @@
             </view>
             <view class="input_module_as">
               <view class="input_module_as_title"> 所属网点 </view>
-              <view class="input_module_as_en"> {{ form.shopName }} ({{ form.partsWebsiteNumber }}) </view>
+              <view class="input_module_as_en"> {{ form.websitName }} ({{ form.partsWebsitNumber }}) </view>
             </view>
             <view class="input_module_as">
               <view class="input_module_as_title"> *申请类别 </view>
@@ -210,15 +210,15 @@ export default {
     this.form = {
       ...option,
       itemList: [],
-      deliveryUnit: this.option.shopName,
+      deliveryUnit: this.option.websitName,
       identity: this.userInfo.idCard,
       mobile: this.userInfo.mobile,
       receiveUnit: this.userInfo.username,
       workerId: this.userInfo.number,
       workerName: this.userInfo.username,
       belongCompany: this.userInfo.belong_company,
-      websiteName: this.userInfo.websit_worker.websit_name,
-      websiteNumber: this.userInfo.websit_worker.websit_number
+      websitName: this.userInfo.websit_worker.websit_name,
+      websitNumber: this.userInfo.websit_worker.websit_number
     }
     console.log(this.userInfo)
     uni.$on('getAccessoriesItem', data => {
@@ -243,7 +243,7 @@ export default {
   methods: {
     goToChoosingAccessories() {
       this.$navToPage({
-        url: `/packageAttachment/pages/sparePartsInventory/choosingAccessories?apiType=applicationParts&shopId=${this.option.shopId}&shopName=${this.option.shopName}&partsWebsiteNumber=${this.option.partsWebsiteNumber}`
+        url: `/packageAttachment/pages/sparePartsInventory/choosingAccessories?apiType=applicationParts&websitId=${this.option.websitId}&websitName=${this.option.websitName}&partsWebsitNumber=${this.option.partsWebsitNumber}`
       })
     },
     delItem(index) {

+ 3 - 3
src/packageAttachment/pages/applicationParts/confirmOrder.vue

@@ -63,7 +63,7 @@
               <view class="accessories_nfo_title"> 网点: </view>
               <view class="accessories_nfo_info">
                 <view>
-                  {{ info.websiteName }}
+                  {{ info.websitName }}
                 </view>
               </view>
             </view>
@@ -106,7 +106,7 @@ export default {
   methods: {
     getDetails(option) {
       this.$api
-        .get('/app/worker/parts-sales/loadSalesOrderById', option)
+        .post('/app/worker/parts-sales/loadSalesOrderById', option)
         .then(res => {
           this.info = res.data
         })
@@ -114,7 +114,7 @@ export default {
     },
     submit() {
       this.$api
-        .get('/app/worker/parts-sales/submit', {
+        .post('/app/worker/parts-sales/submit', {
           id: this.info.id
         })
         .then(res => {

+ 246 - 236
src/packageAttachment/pages/applicationParts/index.nvue

@@ -1,257 +1,267 @@
 <template>
-	<view class="s_page">
-		<map class="myMap" :latitude="latitude" :longitude="longitude" :markers="markers" style="width: 750rpx;flex: 1;"
-			scale="11"></map>
-		<!-- 左上角返回按钮 -->
-		<image @tap.stop='navBack' class="map-back" src="/static/images/map_back.png" mode=""
-			:style="{top:StatusBar+'px'}"></image>
-		<!-- 申请记录按钮 -->
-		<view class="record-application" @tap.stop="toNavigate" :style="{top:StatusBar+'px'}">
-			<text class="record-application-text">申请记录</text>
-		</view>
-		<!-- 列表 -->
-		<view class="bottom-con">
-			<list @loadmore="loadMore" loadmoreoffset="20" show-scrollbar>
-				<cell class="item" v-for="item in websitList" :key="item.shopId">
-					<view class="mb20 flex_abs mt20">
-						<text class="fw600 f32_302">{{item.shopName}}</text>
-						<text class="f24_999">距离{{(item.distance)}}km</text>
-					</view>
-					<view class="flex_abs">
-						<text class="f28_666" style="width: 520rpx;">地址:{{item.address}}</text>
-						<tag
-							style="width: 150rpx;height: 50rpx;background-image: linear-gradient(to bottom right, #7FDAFF, #6DA7FF);border-radius: 30rpx;">
-							<text @tap.stop="toApplicationPartsForm(item)" class="f24_FFF">申请</text>
-						</tag>
-					</view>
-				</cell>
-			</list>
-		</view>
-	</view>
+  <view class="s_page">
+    <map
+      class="myMap"
+      :latitude="latitude"
+      :longitude="longitude"
+      :markers="markers"
+      style="width: 750rpx; flex: 1"
+      scale="11"
+    ></map>
+    <!-- 左上角返回按钮 -->
+    <image
+      @tap.stop="navBack"
+      class="map-back"
+      src="/static/images/map_back.png"
+      mode=""
+      :style="{ top: StatusBar + 'px' }"
+    ></image>
+    <!-- 申请记录按钮 -->
+    <view class="record-application" @tap.stop="toNavigate" :style="{ top: StatusBar + 'px' }">
+      <text class="record-application-text">申请记录</text>
+    </view>
+    <!-- 列表 -->
+    <view class="bottom-con">
+      <list @loadmore="loadMore" loadmoreoffset="20" show-scrollbar>
+        <cell class="item" v-for="item in websitList" :key="item.websitId">
+          <view class="mb20 flex_abs mt20">
+            <text class="fw600 f32_302">{{ item.websitName }}</text>
+            <text class="f24_999">距离{{ item.distance }}km</text>
+          </view>
+          <view class="flex_abs">
+            <text class="f28_666" style="width: 520rpx">地址:{{ item.address }}</text>
+            <tag
+              style="
+                width: 150rpx;
+                height: 50rpx;
+                background-image: linear-gradient(to bottom right, #7fdaff, #6da7ff);
+                border-radius: 30rpx;
+              "
+            >
+              <text @tap.stop="toApplicationPartsForm(item)" class="f24_FFF">申请</text>
+            </tag>
+          </view>
+        </cell>
+      </list>
+    </view>
+  </view>
 </template>
 
 <script>
-	const sysInfo = uni.getSystemInfoSync();
+const sysInfo = uni.getSystemInfoSync()
 import api from '@/common/http/'
-	import tag from '@/components/tag.vue';
-	export default {
-		components: {
-			tag
-		},
-		data() {
-			return {
-				StatusBar: sysInfo.statusBarHeight,
-				latitude: '',
-				longitude: '',
-				markers: [{
-					id: 'm_1',
-					latitude: 23.183466,
-					longitude: 113.35709,
-					iconPath: '/static/images/order_call.png'
-				}],
-				websitList: [],
-				page: 1,
-				pageSize: 3,
-				websit_number: ""
-			};
-		},
-		async onLoad() {
-			const getWebsit_number = uni.getStorageSync("userInfo")
-			this.websit_number = getWebsit_number.websit_number
-			await this.getCurrentWebsit()
-			await this.getWebsitList()
-		},
-		methods: {
-			navBack() {
-				uni.navigateBack({
-					delta: 1
-				})
-			},
-			toNavigate() {
-				this.$navToPage({
-					url: `/packageAttachment/pages/orderOfSales/index`
-				})
-			},
-			toApplicationPartsForm(item) {
-				var {
-					shopId,
-					shopName,
-					partsWebsiteNumber
-				} = item
-				this.$navToPage({
-					url: `/packageAttachment/pages/applicationParts/applicationPartsForm?shopId=${shopId}&shopName=${shopName}&partsWebsiteNumber=${partsWebsiteNumber}`
-				})
-			},
-			loadMore() {
-				this.page++
-				this.getWebsitList()
-			},
-			getWebsitList() {
-				let params = {
-					latitude: this.latitude,
-					longitude: this.longitude,
-					pageNo: this.page,
-					pageSize: this.pageSize,
-					websiteNumber: this.websit_number
-				}
-				api.get('/app/buy/websit/list',params).then(res => {
-					this.websitList = this.websitList.concat(res.data.records).filter(item => (item
-						.partsWebsiteNumber))
-					if (this.websitList.length != 0) {
-						this.markers = this.websitList.map(item => {
-							return {
-								id: item.shopId,
-								latitude: item.latitude,
-								longitude: item.longitude,
-								width: 28,
-								height: 28,
-								fontSize: 16,
-								iconPath: '',
-								callout: {
-									content: item.shopName,
-									padding: 5,
-									display: 'ALWAYS',
-									borderRadius: 5,
-									color: '#E95505'
-								}
-							}
-						})
-					}
-				})
-			},
-			async getCurrentWebsit() {
-				const addressInfo = await new Promise((resolve, reject) => {
-					uni.getLocation({
-						type: 'gcj02',
-						geocode: true,
-						success: res => {
-							resolve({
-								lat: res.latitude,
-								lng: res.longitude,
-								address: res.address
-							})
-						},
-						fail: err => {
-							reject(err)
-						}
-					})
-				});
-				let {
-					lat,
-					lng
-				} = addressInfo
-				this.latitude = lat
-				this.longitude = lng
-			}
-		}
-
-	}
+import tag from '@/components/tag.vue'
+export default {
+  components: {
+    tag
+  },
+  data() {
+    return {
+      StatusBar: sysInfo.statusBarHeight,
+      latitude: '',
+      longitude: '',
+      markers: [
+        {
+          id: 'm_1',
+          latitude: 23.183466,
+          longitude: 113.35709,
+          iconPath: '/static/images/order_call.png'
+        }
+      ],
+      websitList: [],
+      page: 1,
+      pageSize: 3,
+      websit_number: ''
+    }
+  },
+  async onLoad() {
+    const getWebsit_number = uni.getStorageSync('userInfo')
+    this.websit_number = getWebsit_number.websit_number
+    await this.getCurrentWebsit()
+    await this.getWebsitList()
+  },
+  methods: {
+    navBack() {
+      uni.navigateBack({
+        delta: 1
+      })
+    },
+    toNavigate() {
+      this.$navToPage({
+        url: `/packageAttachment/pages/orderOfSales/index`
+      })
+    },
+    toApplicationPartsForm(item) {
+      var { websitId, websitName, partsWebsitNumber } = item
+      this.$navToPage({
+        url: `/packageAttachment/pages/applicationParts/applicationPartsForm?websitId=${websitId}&websitName=${websitName}&partsWebsitNumber=${partsWebsitNumber}`
+      })
+    },
+    loadMore() {
+      this.page++
+      this.getWebsitList()
+    },
+    getWebsitList() {
+      let params = {
+        latitude: this.latitude,
+        longitude: this.longitude,
+        pageNo: this.page,
+        pageSize: this.pageSize,
+        websitNumber: this.websit_number
+      }
+      api.post('/app/buy/websit/list', params).then(res => {
+        this.websitList = this.websitList.concat(res.data.records).filter(item => item.partsWebsitNumber)
+        if (this.websitList.length != 0) {
+          this.markers = this.websitList.map(item => {
+            return {
+              id: item.websitId,
+              latitude: item.latitude,
+              longitude: item.longitude,
+              width: 28,
+              height: 28,
+              fontSize: 16,
+              iconPath: '',
+              callout: {
+                content: item.websitName,
+                padding: 5,
+                display: 'ALWAYS',
+                borderRadius: 5,
+                color: '#E95505'
+              }
+            }
+          })
+        }
+      })
+    },
+    async getCurrentWebsit() {
+      const addressInfo = await new Promise((resolve, reject) => {
+        uni.getLocation({
+          type: 'gcj02',
+          geocode: true,
+          success: res => {
+            resolve({
+              lat: res.latitude,
+              lng: res.longitude,
+              address: res.address
+            })
+          },
+          fail: err => {
+            reject(err)
+          }
+        })
+      })
+      let { lat, lng } = addressInfo
+      this.latitude = lat
+      this.longitude = lng
+    }
+  }
+}
 </script>
 
 <style scoped lang="scss">
-	.confirm-btn {
-		background-image: linear-gradient(to bottom right, #7FDAFF, #6DA7FF);
-	}
+.confirm-btn {
+  background-image: linear-gradient(to bottom right, #7fdaff, #6da7ff);
+}
 
-	.map-back {
-		position: absolute;
-		left: 30rpx;
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 30rpx;
-		overflow: hidden;
-	}
+.map-back {
+  position: absolute;
+  left: 30rpx;
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 30rpx;
+  overflow: hidden;
+}
 
-	.record-application {
-		position: absolute;
-		right: 30rpx;
-		width: auto;
-		height: 60rpx;
-		border-radius: 30rpx;
-		box-sizing: border-box;
-		padding: 0 20rpx;
-		background: #6DA7FF;
-	}
+.record-application {
+  position: absolute;
+  right: 30rpx;
+  width: auto;
+  height: 60rpx;
+  border-radius: 30rpx;
+  box-sizing: border-box;
+  padding: 0 20rpx;
+  background: #6da7ff;
+}
 
-	.record-application-text {
-		font-size: 28rpx;
-		font-weight: 500;
-		text-align: center;
-		color: #ffffff !important;
-		line-height: 60rpx;
-	}
+.record-application-text {
+  font-size: 28rpx;
+  font-weight: 500;
+  text-align: center;
+  color: #ffffff !important;
+  line-height: 60rpx;
+}
 
-	.bottom-con {
-		width: 750rpx;
-		padding-top: 25rpx;
-		padding-left: 25rpx;
-		padding-bottom: 30rpx;
-		padding-right: 25rpx;
-		// border-radius: 40rpx;
-		border-top-right-radius: 40rpx;
-		border-top-left-radius: 40rpx;
-		// box-shadow: 0px -10rpx 40rpx 0px rgba(0, 0, 0, 0.05);
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #FFFFFF;
-		z-index: 100;
-		// overflow:hidden;
-		height: 500rpx;
-	}
+.bottom-con {
+  width: 750rpx;
+  padding-top: 25rpx;
+  padding-left: 25rpx;
+  padding-bottom: 30rpx;
+  padding-right: 25rpx;
+  // border-radius: 40rpx;
+  border-top-right-radius: 40rpx;
+  border-top-left-radius: 40rpx;
+  // box-shadow: 0px -10rpx 40rpx 0px rgba(0, 0, 0, 0.05);
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  background-color: #ffffff;
+  z-index: 100;
+  // overflow:hidden;
+  height: 500rpx;
+}
 
-	.item {
-		background-color: #FFFFFF;
-		overflow: hidden;
-		border-bottom: 2rpx solid #F7F7F7;
-		padding-bottom: 20rpx;
-	}
+.item {
+  background-color: #ffffff;
+  overflow: hidden;
+  border-bottom: 2rpx solid #f7f7f7;
+  padding-bottom: 20rpx;
+}
 
-	.flex_abs {
-		flex-direction: row;
-	}
+.flex_abs {
+  flex-direction: row;
+}
 
-	.mask {
-		position: fixed;
-		left: 0;
-		top: 0;
-		bottom: 0;
-		right: 0;
-		background-color: rgba(0, 0, 0, 0.3);
-		z-index: 1000;
-		justify-content: center;
-		align-items: center;
-	}
+.mask {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.3);
+  z-index: 1000;
+  justify-content: center;
+  align-items: center;
+}
 
-	.closes {
-		flex-direction: row;
-		justify-content: flex-end;
-	}
+.closes {
+  flex-direction: row;
+  justify-content: flex-end;
+}
 
-	.closes-img {
-		height: 40rpx;
-		width: 40rpx;
-	}
+.closes-img {
+  height: 40rpx;
+  width: 40rpx;
+}
 
-	.phone-con {
-		width: 540rpx;
-		border-radius: 20rpx;
-		background-color: #ffffff;
-		text-align: center;
-		padding: 10rpx 30rpx 40rpx 30rpx;
-		position: relative;
+.phone-con {
+  width: 540rpx;
+  border-radius: 20rpx;
+  background-color: #ffffff;
+  text-align: center;
+  padding: 10rpx 30rpx 40rpx 30rpx;
+  position: relative;
 
-		.confirm-btn {
-			font-size: 32rpx;
-			color: #FFFFFF;
-		}
+  .confirm-btn {
+    font-size: 32rpx;
+    color: #ffffff;
+  }
 
-		.iconfont {
-			color: #E5E5E5;
-			position: absolute;
-			right: 30rpx;
-			top: 30rpx;
-			color: #333333;
-		}
-	}
+  .iconfont {
+    color: #e5e5e5;
+    position: absolute;
+    right: 30rpx;
+    top: 30rpx;
+    color: #333333;
+  }
+}
 </style>

+ 12 - 12
src/packageAttachment/pages/applicationParts/orderPayment.vue

@@ -63,7 +63,7 @@
               <view class="accessories_nfo_title"> 网点: </view>
               <view class="accessories_nfo_info">
                 <view>
-                  {{ info.websiteName }}
+                  {{ info.websitName }}
                 </view>
               </view>
             </view>
@@ -94,11 +94,11 @@
                     class="picker-select"
                     @change="bindPickerChange"
                     :value="index"
-                    :range="shopList"
+                    :range="websitList"
                     range-key="name"
                   >
                     <view class="picker-select-input">
-                      {{ shopList[index] ? shopList[index].name : '请选择' }}
+                      {{ websitList[index] ? websitList[index].name : '请选择' }}
                     </view>
                   </picker>
                   <image
@@ -137,7 +137,7 @@ export default {
     return {
       info: null,
       option: {},
-      shopList: [],
+      websitList: [],
       index: 0,
       bool: false
     }
@@ -156,17 +156,17 @@ export default {
   methods: {
     quxiao() {},
     // 获取网点
-    getShopInfo(shopId) {
+    getWebsitInfo(websitId) {
       this.$api
-        .get('/app/online/pay-config-list', {
-          shopId: shopId,
+        .post('/app/online/pay-config-list', {
+          websitId: websitId,
           category: 'P'
         })
         .then(res => {
-          this.shopList = res.data
+          this.websitList = res.data
         })
         .catch(() => {
-          this.shopList = []
+          this.websitList = []
         })
     },
     // 监听下拉选项
@@ -175,9 +175,9 @@ export default {
     },
     getDetails() {
       this.$api
-        .get('/app/worker/parts-sales/loadSalesOrderById', this.option)
+        .post('/app/worker/parts-sales/loadSalesOrderById', this.option)
         .then(res => {
-          this.getShopInfo(res.data.shopId)
+          this.getWebsitInfo(res.data.websitId)
           this.info = res.data
         })
         .catch(() => {})
@@ -185,7 +185,7 @@ export default {
     submit() {
       this.$api
         .postJson('/app/online/save/sheet-pay-map', {
-          payId: this.shopList[this.index].id,
+          payId: this.websitList[this.index].id,
           sheetId: this.info.salesOrderNo
         })
         .then(res => {

+ 2 - 2
src/packageAttachment/pages/applicationParts/state.vue

@@ -49,7 +49,7 @@ export default {
   methods: {
     getDetails() {
       this.$api
-        .get('/app/worker/parts-sales/loadSalesOrderById', this.option)
+        .post('/app/worker/parts-sales/loadSalesOrderById', this.option)
         .then(res => {
           if (res.data.payFlag === 1) {
             this.state = true
@@ -59,7 +59,7 @@ export default {
               this.getDetails()
             }, 1000)
           }
-          this.getShopInfo(res.data.shopId)
+          this.getWebsitInfo(res.data.websitId)
           this.info = res.data
         })
         .catch(() => {})

+ 9 - 9
src/packageAttachment/pages/applyReturnOfNewPiece/index.vue

@@ -10,7 +10,7 @@
             </view>
             <view class="input_module_as">
               <view class="input_module_as_title"> 所属网点 </view>
-              <view class="input_module_as_en"> {{ form.websiteName }} ({{ form.websiteNumber }}) </view>
+              <view class="input_module_as_en"> {{ form.websitName }} ({{ form.websitNumber }}) </view>
             </view>
             <view class="input_module_as">
               <view class="input_module_as_title"> *申请类别 </view>
@@ -257,8 +257,8 @@ export default {
         applyType,
         refundMode,
         belongCompany,
-        websiteName,
-        websiteNumber,
+        websitName,
+        websitNumber,
         workerId,
         workerName,
         remark
@@ -270,15 +270,15 @@ export default {
         applyType,
         refundMode,
         belongCompany,
-        websiteName,
-        websiteNumber,
+        websitName,
+        websitNumber,
         workerId,
         workerName,
         remark,
         newRefundManageItemBeanList,
-        receiveShopId: this.form.shopId,
-        receiveShopName: this.form.shopName,
-        receivePartsWebsiteNumber: this.form.partsWebsiteNumber,
+        receiveWebsitId: this.form.websitId,
+        receiveWebsitName: this.form.websitName,
+        receivePartsWebsitNumber: this.form.partsWebsitNumber,
         receiveAddress: this.form.receiveAddr,
         identity: this.idcard
       }
@@ -294,7 +294,7 @@ export default {
     },
     getDetails(params) {
       this.$api
-        .get('/app/worker/parts-sales/detail', params)
+        .post('/app/worker/parts-sales/detail', params)
         .then(res => {
           if (res.data.itemList && res.data.itemList.length) {
             res.data.itemList.map(item => {

+ 1 - 1
src/packageAttachment/pages/beyondInsuranceTransferToSale/card.vue

@@ -38,7 +38,7 @@
     <view class="accessories_nfo_ac">
       <view class="accessories_nfo_title"> 网点: </view>
       <view class="accessories_nfo_info">
-        <view> {{ item.websiteName }}({{ item.websiteNumber }}) </view>
+        <view> {{ item.websitName }}({{ item.websitNumber }}) </view>
       </view>
     </view>
     <view class="accessories_nfo_ac">

+ 1 - 1
src/packageAttachment/pages/beyondInsuranceTransferToSale/index.vue

@@ -123,7 +123,7 @@ export default {
     // 获取新件返还管理列表
     getList(pageSize) {
       this.$api
-        .get('/app/worker/old-refund/list', {
+        .post('/app/worker/old-refund/list', {
           repairFlag: 'OUTSIDE',
           pageNo: this.pageNo,
           pageSize: pageSize || this.pageSize,

+ 2 - 2
src/packageAttachment/pages/fittingsManagement/index.vue

@@ -143,9 +143,9 @@ export default {
     },
     getInfo(cbk) {
       this.$api
-        .get('/app/parts/stock/query/worker-stock', {
+        .post('/app/parts/stock/query/worker-stock', {
           identity: this.idcard,
-          websiteNumber: uni.getStorageSync('websit_number')
+          websitNumber: uni.getStorageSync('websit_number')
         })
         .then(res => {
           ;['newQty', 'newRefundQty', 'newRefundAmount', 'oldQty', 'oldRefundQty', 'oldRefundAmount'].forEach(

+ 1 - 1
src/packageAttachment/pages/forwardSaleOrder/card.vue

@@ -38,7 +38,7 @@
     <view class="accessories_nfo_ac">
       <view class="accessories_nfo_title"> 网点: </view>
       <view class="accessories_nfo_info">
-        <view> {{ item.shopName }}({{ item.shopId }}) </view>
+        <view> {{ item.websitName }}({{ item.websitId }}) </view>
       </view>
     </view>
   </view>

+ 2 - 2
src/packageAttachment/pages/forwardSaleOrder/details.vue

@@ -39,7 +39,7 @@
             <view class="accessories_nfo_ac">
               <view class="accessories_nfo_title"> 网点: </view>
               <view class="accessories_nfo_info">
-                <view> {{ info.shopName }}({{ info.shopId }}) </view>
+                <view> {{ info.websitName }}({{ info.websitId }}) </view>
               </view>
             </view>
             <template v-if="~['AGREE', 'REJECT'].indexOf(info.flag)">
@@ -94,7 +94,7 @@ export default {
   methods: {
     getDetails(changeSalesNo) {
       this.$api
-        .get('/app/worker/change-sales/detail', {
+        .post('/app/worker/change-sales/detail', {
           changeSalesNo
         })
         .then(res => {

+ 1 - 1
src/packageAttachment/pages/forwardSaleOrder/index.vue

@@ -103,7 +103,7 @@ export default {
     // 获取新件返还管理列表
     getList() {
       this.$api
-        .get('/app/worker/change-sales/list', {
+        .post('/app/worker/change-sales/list', {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
           identity: this.idcard,

+ 1 - 1
src/packageAttachment/pages/orderOfSales/card.vue

@@ -34,7 +34,7 @@
     <view class="accessories_nfo_ac">
       <view class="accessories_nfo_title"> 网点: </view>
       <view class="accessories_nfo_info">
-        <view> {{ item.websiteName }}({{ item.websiteNumber }}) </view>
+        <view> {{ item.websitName }}({{ item.websitNumber }}) </view>
       </view>
     </view>
   </view>

+ 3 - 3
src/packageAttachment/pages/orderOfSales/details.vue

@@ -67,7 +67,7 @@
             <view class="accessories_nfo_ac">
               <view class="accessories_nfo_title"> 网点: </view>
               <view class="accessories_nfo_info">
-                <view> {{ info.websiteName }}({{ info.websiteNumber }}) </view>
+                <view> {{ info.websitName }}({{ info.websitNumber }}) </view>
               </view>
             </view>
             <view class="accessories_nfo_ac">
@@ -268,7 +268,7 @@ export default {
     },
     getDetails(params) {
       this.$api
-        .get('/app/worker/parts-sales/detail', this.params)
+        .post('/app/worker/parts-sales/detail', this.params)
         .then(res => {
           this.info = res.data
         })
@@ -276,7 +276,7 @@ export default {
     },
     confirmationDelivery() {
       this.$api
-        .get('/app/worker/parts-sales/workerConfirmDelivery', {
+        .post('/app/worker/parts-sales/workerConfirmDelivery', {
           salesOrderNo: this.info.salesOrderNo
         })
         .then(res => {

+ 1 - 1
src/packageAttachment/pages/orderOfSales/index.vue

@@ -133,7 +133,7 @@ export default {
     // 获取新件返还管理列表
     getList(pageSize) {
       this.$api
-        .get('/app/worker/parts-sales/list', {
+        .post('/app/worker/parts-sales/list', {
           pageNo: this.pageNo,
           pageSize: pageSize || this.pageSize,
           identity: this.idcard,

+ 1 - 1
src/packageAttachment/pages/returnOfNewParts/card.vue

@@ -38,7 +38,7 @@
     <view class="accessories_nfo_ac">
       <view class="accessories_nfo_title"> 网点: </view>
       <view class="accessories_nfo_info">
-        <view> {{ item.websiteName }}({{ item.websiteNumber }}) </view>
+        <view> {{ item.websitName }}({{ item.websitNumber }}) </view>
       </view>
     </view>
     <view class="accessories_nfo_ac">

+ 3 - 3
src/packageAttachment/pages/returnOfNewParts/details.vue

@@ -83,7 +83,7 @@
             <view class="accessories_nfo_ac">
               <view class="accessories_nfo_title"> 网点: </view>
               <view class="accessories_nfo_info">
-                <view> {{ info.websiteName }}({{ info.websiteNumber }}) </view>
+                <view> {{ info.websitName }}({{ info.websitNumber }}) </view>
               </view>
             </view>
             <view class="accessories_nfo_ac">
@@ -202,7 +202,7 @@
             <view class="accessories_nfo_ac">
               <view class="accessories_nfo_title"> 接收单位: </view>
               <view class="accessories_nfo_info">
-                <view> {{ info.receiveShopName }}({{ info.receiveShopId }}) </view>
+                <view> {{ info.receiveWebsitName }}({{ info.receiveWebsitId }}) </view>
               </view>
             </view>
             <view class="accessories_nfo_ac">
@@ -307,7 +307,7 @@ export default {
   methods: {
     getDetails(applyNo) {
       this.$api
-        .get('/app/worker/new-refund/detail', {
+        .post('/app/worker/new-refund/detail', {
           applyNo
         })
         .then(res => {

+ 1 - 1
src/packageAttachment/pages/returnOfNewParts/index.vue

@@ -130,7 +130,7 @@ export default {
     // 获取新件返还管理列表
     getList() {
       this.$api
-        .get(this.stateType === 'SALES' ? '/app/worker/parts-sales/list' : '/app/worker/new-refund/list', {
+        .post(this.stateType === 'SALES' ? '/app/worker/parts-sales/list' : '/app/worker/new-refund/list', {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
           identity: this.idcard,

+ 1 - 1
src/packageAttachment/pages/returnOfOldParts/card.vue

@@ -38,7 +38,7 @@
     <view class="accessories_nfo_ac">
       <view class="accessories_nfo_title"> 网点: </view>
       <view class="accessories_nfo_info">
-        <view> {{ item.websiteName }}({{ item.websiteNumber }}) </view>
+        <view> {{ item.websitName }}({{ item.websitNumber }}) </view>
       </view>
     </view>
     <view class="accessories_nfo_ac">

+ 2 - 2
src/packageAttachment/pages/returnOfOldParts/details.vue

@@ -81,7 +81,7 @@
             <view class="accessories_nfo_ac">
               <view class="accessories_nfo_title"> 网点: </view>
               <view class="accessories_nfo_info">
-                <view> {{ info.websiteName }}({{ info.websiteNumber }}) </view>
+                <view> {{ info.websitName }}({{ info.websitNumber }}) </view>
               </view>
             </view>
             <!-- <view class="accessories_nfo_ac">
@@ -285,7 +285,7 @@ export default {
   methods: {
     getDetails(applyNo) {
       this.$api
-        .get('/app/worker/old-refund/detail', {
+        .post('/app/worker/old-refund/detail', {
           applyNo
         })
         .then(res => {

+ 1 - 1
src/packageAttachment/pages/returnOfOldParts/index.vue

@@ -123,7 +123,7 @@ export default {
     // 获取新件返还管理列表
     getList(pageSize) {
       this.$api
-        .get('/app/worker/old-refund/list', {
+        .post('/app/worker/old-refund/list', {
           repairFlag: 'INNER',
           pageNo: this.pageNo,
           pageSize: pageSize || this.pageSize,

+ 4 - 4
src/packageAttachment/pages/sparePartsInventory/choosingAccessories.vue

@@ -4,16 +4,16 @@
       <view class="pv30" style="background: #fff">
         <search-input @search="search" />
       </view>
-      <view class="pv30 picker-view-bock" v-if="!option.partsWebsiteNumber && !option.shopId">
+      <view class="pv30 picker-view-bock" v-if="!option.partsWebsitNumber && !option.websitId">
         <view class="picker-view">
           <picker
             class="picker-select"
             @change="bindPickerChange"
             :value="index"
-            :range="shopList"
-            range-key="shopName"
+            :range="websitList"
+            range-key="websitName"
           >
-            <view class="picker-select-input">{{ shopList[index] ? shopList[index].shopName : '请选择' }}</view>
+            <view class="picker-select-input">{{ websitList[index] ? websitList[index].websitName : '请选择' }}</view>
           </picker>
           <image class="icon_next" src="/static/images/fittingsManagement/icon_next.png" mode="aspectFill"></image>
         </view>

+ 3 - 3
src/packageAttachment/pages/sparePartsInventory/index.vue

@@ -10,10 +10,10 @@
             class="picker-select"
             @change="bindPickerChange"
             :value="index"
-            :range="shopList"
-            range-key="shopName"
+            :range="websitList"
+            range-key="websitName"
           >
-            <view class="picker-select-input">{{ shopList[index] ? shopList[index].shopName : '请选择' }}</view>
+            <view class="picker-select-input">{{ websitList[index] ? websitList[index].websitName : '请选择' }}</view>
           </picker>
           <image class="icon_next" src="/static/images/fittingsManagement/icon_next.png" mode="aspectFill"></image>
         </view>

+ 20 - 19
src/packageAttachment/pages/sparePartsInventory/mixins/getData.js

@@ -3,7 +3,7 @@ export default {
   data() {
     return {
       // 网点下拉选项
-      shopList: [],
+      websitList: [],
       // 网点下拉选项选中的下标
       index: 0,
       // 类型切换选中值
@@ -23,38 +23,38 @@ export default {
       option: {},
       apis: {
         default: {
-          getGroupUrl: '/app/parts/stock/exist/shop/group/list',
-          getStockUrl: '/app/parts/stock/exist/shop/stock/list'
+          getGroupUrl: '/app/parts/stock/exist/websit/group/list',
+          getStockUrl: '/app/parts/stock/exist/websit/stock/list'
         },
         applicationParts: {
-          getGroupUrl: '/app/parts/shop/stock/group/list',
-          getStockUrl: '/app/parts/shop/stock/list'
+          getGroupUrl: '/app/parts/websit/stock/group/list',
+          getStockUrl: '/app/parts/websit/stock/list'
         }
       }
     }
   },
   onLoad(option) {
     this.option = option
-    if (!option.partsWebsiteNumber && !option.shopId) {
-      this.getShopInfo()
+    if (!option.partsWebsitNumber && !option.websitId) {
+      this.getWebsitInfo()
     }
   },
   computed: {
     accessoriesParams() {
-      if (this.option.partsWebsiteNumber && this.option.shopId) {
+      if (this.option.partsWebsitNumber && this.option.websitId) {
         return {
           identity: this.userInfo.idCard,
-          partsWebsiteNumber: this.option.partsWebsiteNumber,
-          shopId: this.option.shopId
+          partsWebsitNumber: this.option.partsWebsitNumber,
+          websitId: this.option.websitId
         }
       }
-      var data = this.shopList[this.index]
+      var data = this.websitList[this.index]
       if (data) {
         return {
           identity: this.userInfo.idCard,
           partsAttr: ['OLD', 'NEW'][this.selected],
-          partsWebsiteNumber: data.partsWebsiteNumber,
-          shopId: data.shopId
+          partsWebsitNumber: data.partsWebsitNumber,
+          websitId: data.websitId
         }
       } else {
         return false
@@ -88,23 +88,24 @@ export default {
   },
   methods: {
     // 获取网点
-    getShopInfo() {
+    getWebsitInfo() {
       this.$api
-        .get('/app/parts/stock/exist/shop/list', {
+        .post('/app/parts/stock/exist/websit/list', {
           identity: this.idcard
         })
         .then(res => {
-          this.shopList = res.data
+          console.log(res.data)
+          this.websitList = res.data
         })
         .catch(() => {
-          this.shopList = []
+          this.websitList = []
         })
     },
     // 获取分组
     getGroup(params) {
       if (params) {
         this.$api
-          .get(this.apis[this.option.apiType || 'default'].getGroupUrl, params)
+          .post(this.apis[this.option.apiType || 'default'].getGroupUrl, params)
           .then(res => {
             this.accessoriesList = res.data
           })
@@ -119,7 +120,7 @@ export default {
     getStock() {
       if (this.accessoriesList.length && this.accessoriesList[this.accessoriesIndex]) {
         this.$api
-          .get(this.apis[this.option.apiType || 'default'].getStockUrl, {
+          .post(this.apis[this.option.apiType || 'default'].getStockUrl, {
             ...this.accessoriesParams,
             materialGroupId: this.accessoriesList[this.accessoriesIndex].id,
             partsName: this.partsName