bug修改

src/view/base-manage/provider-maintenance/provider-maintenance2.vue

@@ -1313,39 +1313,7 @@ export default {
 					this.statisticsClassifyData = res.data
 					
 				})
-    },
-    //获取物料类型树
-    socketInit(){
-      var ws = new WebSocket("ws://36.134.91.96:10001/api/storage-restructure/webStock/123123"); 
-      //申请一个WebSocket对象，参数是服务端地址，同http协议使用http://开头一样，WebSocket协议的url使用ws://开头，另外安全的WebSocket协议使用wss://开头
-      ws.onopen = function(){
-      　　//当WebSocket创建成功时，触发onopen事件
-        console.log("open");
-      　　ws.send("hello"); //将消息发送到服务端
-      }
-      ws.onmessage = function(e){
-      　　//当客户端收到服务端发来的消息时，触发onmessage事件，参数e.data包含server传递过来的数据
-        console.log(e.data,'1111111111111111111111111111')
-        var msg = JSON.parse(e.data)
-        if(msg.type == 1){
-          
-          msg.data.instructions = 'test'
-          msg.data.type = '2'
-          msg.type = '2'
-          ws.send(JSON.stringify(msg));
-        }
-       
-        
-      }
-      ws.onclose = function(e){
-      　　//当客户端收到服务端发送的关闭连接请求时，触发onclose事件
-      　　console.log("close");
       }
-      ws.onerror = function(e){
-      　　//如果出现连接、处理、接收、发送数据失败的时候触发onerror事件
-      　　console.log(error);
-      }
-    },
     
   },
   mounted () {

src/view/material-manege/contract/contract.vue

@@ -362,7 +362,7 @@ export default {
         },
         {
           title: '合同编号',
-          key: 'purchaseBillNo',
+          key: 'contractCode',
           minWidth: 180,
           sortable: true,
           render: (h, params) => {
@@ -372,6 +372,7 @@ export default {
                 click (e) {
                   e.stopPropagation()
                   _this.formData = { ...params.row }
+                  console.log(params.row.status)
                   if (params.row.status === 2 || params.row.status === 3) {
                     _this.tabShow = true
                   } else {
@@ -379,12 +380,12 @@ export default {
                   }
                 }
               }
-            }, params.row.purchaseBillNo)
+            }, params.row.contractCode)
           }
         },
         {
           title: '申购单号',
-          key: 'applyBillNo',
+          key: 'applyPurchaseCode',
           minWidth: 200,
           render: (h, params) => {
             let _this = this
@@ -392,10 +393,10 @@ export default {
               on: {
                 click (e) {
                   e.stopPropagation()
-                  _this.showApplyBill(params.row.applyBillNo)
+                  _this.showApplyBill(params.row.applyPurchaseCode)
                 }
               }
-            }, params.row.applyBillNo)
+            }, params.row.applyPurchaseCode)
           }
         },
         {
@@ -418,7 +419,7 @@ export default {
         },
         {
           title: '规格',
-          key: 'spec',
+          key: 'materialSpec',
           minWidth: 100,
           sortable: true
         },
@@ -451,37 +452,37 @@ export default {
         },
         {
           title: '实时库存',
-          key: 'stockNum',
+          key: 'stockQuantity',
           minWidth: 120,
           sortable: true
         },
         {
           title: '采购数量',
-          key: 'purchaseQty',
+          key: 'buyQuantity',
           minWidth: 120,
           sortable: true
         },
         {
           title: '未入库数量',
-          key: 'unStockInQty',
+          key: 'afloatQuantity',
           minWidth: 120,
           sortable: true
         },
         {
           title: '单价',
-          key: 'price',
+          key: 'materialPrice',
           minWidth: 100,
           sortable: true
         },
         {
           title: '小计',
-          key: 'totalAmount',
+          key: 'amountMoney',
           minWidth: 100,
           sortable: true
         },
         {
           title: '合同状态',
-          key: 'contractApproveState',
+          key: 'status',
           minWidth: 120,
           align: 'center',
           sortable: true

src/view/material-manege/contract/modal.vue

@@ -6,7 +6,7 @@
       <div class="row">
         <div class="col">
           <div class="label">合同编号：</div>
-          <div class="value">{{ data.purchaseBillNo }}</div>
+          <div class="value">{{ data.contractCode }}</div>
         </div>
         <div class="col">
           <div class="label">交货日期：</div>
@@ -36,11 +36,11 @@
           <tr>
             <td>{{ data.materialCode }}</td>
             <td>{{ data.materialName }}</td>
-            <td>{{ data.spec }}</td>
-            <td>{{ data.unitName }}</td>
-            <td>{{ data.purchaseQty }}</td>
-            <td>{{ data.price }}</td>
-            <td>{{ data.purchaseQty * data.price }}</td>
+            <td>{{ data.materialSpec }}</td>
+            <td>{{ data.materialUnit }}</td>
+            <td>{{ data.buyQuantity }}</td>
+            <td>{{ data.materialPrice }}</td>
+            <td>{{ data.buyQuantity * data.materialPrice }}</td>
             <td>{{ data.remark }}</td>
           </tr>
         </table>
@@ -101,7 +101,7 @@
             type="number"
             style="width: 60px;margin-right: 5px"
           />
-          天账期，供方提供{{ data.taxValue * 100 }}%增值税{{
+          天账期，供方提供13%增值税{{
             data.invoiceType === 0 ? '专用' : '普通'
           }}发票
         </p>
@@ -130,7 +130,7 @@
           <div class="label">供方：</div>
           <div class="value" style="flex: 1">
             <Input
-              v-if="data.contractApproveState === '待确认'"
+              v-if="data.status === 0"
               v-model="data.supplierName"
               search
               enter-button="选择供应商"
@@ -163,7 +163,7 @@
     </div>
     <div
       class="footer"
-      v-if="data.contractApproveState === '待确认'"
+      v-if="data.status === 0"
       slot="footer"
     >
       <Button @click="cfm" class="btn" type="primary">提交</Button>
@@ -232,7 +232,7 @@ export default {
         // },
         {
           title: '供应商名称',
-          key: 'facName',
+          key: 'materialCode',
           minWidth: 150
         },
         {
@@ -371,15 +371,15 @@ export default {
       this.getList()
     },
     getList () {
-      GetFacPricePageList({
+      this.$post('/api/storage-restructure/supplier/page', {
         ...this.params,
-        materialCode: this.data.materialCode
-      }).then(res => {
-        if (res.code === 0) {
-          this.gysData = res.result.list
-          this.params.total = res.result.totalCount
-        }
+        materialId: this.data.materialId
       })
+				.then((res) => {
+					this.gysData = res.data.records
+          this.params.total = res.data.total
+				}) 
+      
     }
   }
 }

src/view/store-manage/store-manage/store-manage-2.vue

@@ -593,14 +593,13 @@ export default {
 		getMaterialSelectList() {
 			const v = this
 			v.loading = true
-			axios
-				.post('/cloudApi/material/selectList', {
+			this.$post('/api/storage-restructure/material/page', {
 					pageNum:1,
 					pageSize:10,
-					search: v.params.keyword,
+					keyword: v.params.keyword,
 				})
 				.then((res) => {
-					v.materialList = res.data.data
+					v.materialList = res.data.records
 					v.loading = false
 				})
 			
@@ -692,28 +691,28 @@ export default {
 		},
 		getRemainingToday() {
 			const v = this
-			axios
-				.post('/cloudApi/stockWater/remainingToday', {})
+			this
+				.$post('/api/storage-restructure/stock/statistics', {})
 				.then((res) => {
 					console.log(res)
 					for (
 						let i = 0;
-						i < res.data.data.purposeStatistics.length;
+						i < res.data.purposeStatistics.length;
 						i++
 					) {
-						const element = res.data.data.purposeStatistics[i]
+						const element = res.data.purposeStatistics[i]
 						if (element.materialPurpose == '')
 							element.materialPurpose = '其他'
 					}
-					this.totalData.fabric = res.data.data.fabric
-					this.totalData.ink = res.data.data.ink
+					this.totalData.fabric = res.data.fabric
+					this.totalData.ink = res.data.ink
 					this.totalData.purposeStatistics =
-						res.data.data.purposeStatistics
+						res.data.purposeStatistics
 					this.totalData.typeStatistics = [
-						{ ...res.data.data.typeStatistics[0], name: '直喷' },
-						{ ...res.data.data.typeStatistics[1], name: '热转' },
-						{ ...res.data.data.typeStatistics[2], name: '打纸' },
-						{ ...res.data.data.typeStatistics[4], name: '其他' },
+						{ ...res.data.typeStatistics[0], name: '直喷' },
+						{ ...res.data.typeStatistics[1], name: '热转' },
+						{ ...res.data.typeStatistics[2], name: '打纸' },
+						{ ...res.data.typeStatistics[4], name: '其他' },
 					]
 				})
 		},
@@ -731,7 +730,7 @@ export default {
 		errChange() {
 			this.params.pageIndex = 1
 			this.getList()
-		},
+		}, 
 		open(item) {
 			if (!item.storageDetails) {
 				axios
@@ -935,13 +934,21 @@ export default {
 					this.handleData(item.children)
 				}
 			})
+		}, 
+		treeInit(data){
+			for (let i = 0; i < data.length; i++) {
+				const element = data[i]; 
+				element.title = element.name
+				element.value = element.code
+				element.label = element.name
+				if(element.children && element.children.length > 0) this.treeInit(element.children)
+			}
 		},
-		getTree() {
-			GetMaterialCategoryZTree().then((res) => {
-				if (res.code === 0) {
-					this.materialTreeData = res.result
-					this.handleData(this.materialTreeData)
-				}
+		getTree () {
+		const v = this
+			v.$post('/api/storage-restructure/materialClassify/tree').then(res=>{
+				v.treeInit(res.data)
+				this.materialTreeData = res.data
 			})
 		},
 		getTitleData() {
@@ -981,15 +988,13 @@ export default {
 			})
 		},
 		getStockHouse() {
-			GetStockHouse().then((res) => {
-				if (res.code === 0) {
-					this.stockList = res.result.map((item) => {
-						return {
-							label: item.name,
-							value: item.id,
-						}
-					})
-				}
+			this.$post('/api/storage-restructure/stockHouse/page',this.params).then(res=>{
+				this.stockList = res.data.records.map((item) => {
+					return {
+						label: item.name,
+						value: item.id,
+					}
+				})
 			})
 		},
 	},