bug修改库存管理上线

src/components/my-modal-form/my-modal-form.vue

@@ -474,7 +474,10 @@ export default {
 						this.isFirst = false
 					}, 100)
 					if (this.data.categoryCode) {
-						this.$refs.myTreeSelect[0].init(this.data.categoryCode)
+						if(this.$refs.myTreeSelect && this.$refs.myTreeSelect[0]){
+							this.$refs.myTreeSelect[0].init(this.data.categoryCode)
+						}
+						
 					}
 				} else {
 					this.isFirst = true

src/locale/lang/zh-CN.js

@@ -20,6 +20,7 @@ export default {
   quality_record: '质检记录',
   store_manage: '* 库存管理',
   store: '库存管理',
+  store2: '库存管理',
   inventory_record: '盘点记录',
   inventory_record_detail: '盘点明细',
   inventory: '发起盘点',

src/router/routers.js

@@ -516,7 +516,7 @@ export default [
       },
       {
         path: '/store2',
-        name: 'store',
+        name: 'store2',
         meta: {
           title: '库存管理'
         },

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

@@ -368,8 +368,20 @@ export default {
 				},
 				{
 					title: '物料类型',
-					key: 'categoryName',
+					key: 'technologyType',
 					minWidth: 150,
+					render:(h,p)=>{
+						if(p.row.technologyType < 0){
+							return h('span',{},
+								'其他'
+							)
+						}else{
+							return h('span',{},
+								this.technologyTypeList[p.row.technologyType]
+							)
+						}
+						
+					}
 				},
 				{
 					title: '采购总额',

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

@@ -153,7 +153,7 @@
                     },
                     {
                         title: '调整时间',
-                        key: 'updatedTime'
+                        key: 'createdTime'
                     },
                     {
                         title: '原单价',
@@ -294,7 +294,7 @@
                                 key: element.createdTime
                             })
                             data2Copy[0][element.createdTime] = element.money * 1
-                            data2Copy[1][element.createdTime] = element.purProportion
+                            data2Copy[1][element.createdTime] = element.purProportion * 100 + '%'
                         }
                         v.columns2 = columns2Copy
                         v.data2 = data2Copy
@@ -342,11 +342,12 @@
                         ]
                         for (let i = 0; i < res.data.data.length; i++) {
                             const element = res.data.data[i];
+                            element.createdTime = element.createdTime.slice(0,7)
                             columns2Copy.push({
                                 title: element.createdTime,
                                 key: element.createdTime
                             })
-                            data2Copy[0][element.createdTime] = element.count * 1
+                            data2Copy[0][element.createdTime] = (element.count == -1 ) ? 0 : element.count * 1
                             data2Copy[1][element.createdTime] = element.sumMoney * 1
                         }
                         v.columns4 = columns2Copy
@@ -412,8 +413,10 @@ h3{
             font-size: 14px;
             padding:8px 0;
             color: #3F3F3F;
+            font-weight: 600;
             span{
                 color: #6E6E6E;
+                font-weight: 400;
             }
         }
     }

src/view/index/schedule/contract-form.vue

@@ -378,18 +378,18 @@ export default {
             this.flowsList = res.result
           }
         })
-        axios.get('/supplier/su/detail?id=' + this.data.supplierId, {}).then(res=>{
+        axios.get('/cloudApi/supplier/su/detail?id=' + this.data.supplierId, {}).then(res=>{
           if(res.data.code == 200){
             this.supplierDetail = res.data.data
           }
         })
-        axios.get('/purchaseContract/check/isNewSu?materialCode=' + this.data.materialCode + '&supplierId=' + this.data.supplierId, {}).then(res=>{
+        axios.get('/cloudApi/purchaseContract/check/isNewSu?materialCode=' + this.data.materialCode + '&supplierId=' + this.data.supplierId, {}).then(res=>{
           if(res.data.code == 200){
             this.isNewSu = res.data.data
           }
           
         })
-        axios.get('/purchaseContract/last/newPur?materialCode=' + this.data.materialCode, {}).then(res=>{
+        axios.get('/cloudApi/purchaseContract/last/newPur?materialCode=' + this.data.materialCode, {}).then(res=>{
           res.data.data.purchaseQty = (res.data.data.purchaseQty * 1).toFixed(2)
           this.newPurData = res.data.data
         })

src/view/material-manege/pay/pay-history2.vue

@@ -1,10 +1,11 @@
 <!-- 合同付款详情 -->
 <template>
   <div class="container-wrap">
-    <div>
-        <Input></Input>
+    <div style="margin-bottom:10px">
+        <date-select v-model="params" @change="selectTime"></date-select>
     </div>
     <div style="background:#fff;padding:10px;margin-bottom:10px">
+        
         <Tabs v-model="salesVolumeCompanyTotalType" @on-click="tabsChange">
             <TabPane  label="全部" name="1"></TabPane>
             <TabPane :label="(h) => {
@@ -39,12 +40,12 @@
             }" name="6"></TabPane>
         </Tabs>
         <div>
-            <Button style="margin:0 10px 5px 0" :type="params.companySelectId == null ? 'primary' : 'default'" @click="changeCompany(null,0)" >全部</Button>
+            <Button style="margin:0 10px 5px 0" :type="params.supplierId == null || params.supplierId =='' ? 'primary' : 'default'" @click="changeCompany(null,0,'')" >全部</Button>
             <Button 
                 style="margin:0 10px 5px 0" 
-                @click="changeCompany(i.supplierId,index)" 
+                @click="changeCompany(i.supplierId,index,i.supplierName)" 
                 v-for="(i,index) in statisticsData" 
-                :type="params.companySelectId == i.supplierId ? 'primary' : 'default'"
+                :type="params.supplierId == i.supplierId ? 'primary' : 'default'"
                 :key="i.supplierId"
                 v-if="i.type == salesVolumeCompanyTotalType || salesVolumeCompanyTotalType == '1'">
                 {{i.supplierName}}<span :style="params.companySelectId == i.supplierId ?  'color:#ffc107' : 'color:red'"> ({{i.total}})</span>
@@ -52,6 +53,15 @@
         </div>
     </div>
     <div class="container">
+      <Form ref="formInline" inline :label-width="100">
+          <Form-item  label="按供应商查找">
+              <Input type="text" v-model="params.supplierName" placeholder="输入关键字模糊搜索"></Input>
+          </Form-item>
+          <Form-item label="按物料查找">
+              <Input type="text" v-model="params.materialName" placeholder="输入关键字模糊搜索"></Input>
+          </Form-item>
+          <Button type="primary" @click="changePage(1)">搜索</Button>
+      </Form>
       <!-- 表格 -->
       <div class="table-content">
         <div v-if="data && data.length === 0" style="height: 100%;display: flex;justify-content: center;align-items: center">
@@ -218,6 +228,7 @@ import InvoiceForm from './modals/invoice-form'
 import ContractForm from './modals/contract-form'
 import ApplyForm from './modals/apply-pass-form'
 import { GetInStockBill } from '@/api/stock'
+import  dateSelect  from '@/components/dateSelect/dateSelect'
 import axios from 'axios'
 export default {
   name: 'material_pay_detail',
@@ -229,7 +240,8 @@ export default {
     QualityForm,
     InvoiceForm,
     ContractForm,
-    ApplyForm
+    ApplyForm,
+    dateSelect
   },
   data () {
     return {
@@ -265,14 +277,35 @@ export default {
         supplierId: '',
         supplierName: '',
         strTime: '',
-        endTime: ''
+        endTime: '',
       }
     }
   },
   methods: {
+    selectTime(){
+      const v = this
+      v.params.supplierId = ''
+      v.params.pageNum = 1
+      v.getList()
+      v.getStatistics()
+    },
+    changeCompany(_id,index,_name){
+			const v = this
+			v.params.pageIndex = 1
+			if(v.params.supplierId == _id || _id == null){
+				// v.showList = v.showListCopy.slice(0,10)
+				v.params.supplierId = null
+        
+			}else{
+				v.params.supplierId =  _id
+        
+			}
+			v.getList()
+			
+		},
     tabsChange(){
         const v = this
-        v.params.companySelectId = null
+        v.params.supplierId = null
         //v.searchFn()
     },
     filterChange () {
@@ -377,6 +410,13 @@ export default {
             .post('/cloudApi/purchaseContract/pay/statistics', v.params)
             .then((res) => {
                 this.statisticsData = res.data.data
+                v.salesVolumeCompanyTotal = {
+                    '50up':0,
+                    '20-50':0,
+                    '10-20':0,
+                    '5-10':0,
+                    '5down':0,
+                }
                 for (let i = 0; i < res.data.data.length; i++) {
                     const element = res.data.data[i];
                     element.total = element.sumMoney * 1
@@ -423,7 +463,7 @@ export default {
 
 <style lang="less" scoped>
 .container-wrap {
-  height: 100%;
+  
   overflow: hidden;
   display: flex;
   flex-direction: column;

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

@@ -16,7 +16,7 @@
 						params.technologyType == 4 ? 'border:2px solid #0077ff' : ''
 					"
 					style="width: 50%"
-					@click="mianliaoTbleLineCk({ name: '面料' }, 4)"
+					@click="mianliaoTbleLineCk({ name: '面料' }, 5)"
 				>
 					<div class="label" style="border-right: 2px solid #dcdcdc">
 						<Icon
@@ -86,8 +86,9 @@
 					:columns="columns1"
 					@on-row-click="mianliaoTbleLineCk"
 					:row-class-name="rowClassName2"
-					height="190"
+					height="195"
 					:data="totalData.typeStatistics"
+					size="small"
 				></Table>
 			</div>
 			<div style="width: 49%">
@@ -95,8 +96,9 @@
 					@on-row-click="yongtuTbleLineCk"
 					:row-class-name="rowClassName"
 					:columns="columns2"
-					height="190"
+					height="195"
 					:data="totalData.purposeStatistics"
+					size="small"
 				></Table>
 			</div>
 		</div>
@@ -241,10 +243,10 @@
 							</div>
 							<div class="row">
 								<div class="col">
-									库存数量：{{ item.houseInfo.sum }}
+									库存数量：{{ item.sum }}
 								</div>
 								<div class="col">
-									库存件数：{{ item.houseInfo.count }}
+									库存件数：{{ item.count }}
 								</div>
 								<div class="col orange">
 									滞留数量：{{ item.retentionQuantity }}
@@ -267,12 +269,12 @@
 							<div class="row">
 								<div class="col">
 									{{
-										`一楼：${item.yilouSum}，四楼：${item.yilouCount}`
+										`一楼：${item.yilouSum}，四楼：${ item.silouSum || 0}`
 									}}
 								</div>
 								<div class="col">
 									{{
-										`一楼：${item.silouSum}，四楼：${item.silouCount}`
+										`一楼：${item.yilouCount}，四楼：${item.silouCount || 0}`
 									}}
 								</div>
 								<div class="col"></div>
@@ -546,7 +548,11 @@ export default {
 			}
 		},
 		rowClassName2(row, index) {
-			if (row.name == this.technologyTypeName) {
+			
+			if (index == this.params.technologyType) {
+				return 'table-info-row'
+			}
+			if(index == 3 && this.params.technologyType == 4){
 				return 'table-info-row'
 			}
 		},
@@ -565,9 +571,12 @@ export default {
 			this.getList()
 		},
 		mianliaoTbleLineCk(row, index) {
-			this.technologyTypeName = row.name
+			
 			this.params.purpose = null
 			this.params.technologyType = index
+			if(this.params.technologyType == 3){
+				this.params.technologyType = 4
+			}
 			this.getList()
 		},
 		getList() {
@@ -580,11 +589,12 @@ export default {
 							const element = res.data.data.records[i]
 							for (let j = 0; j < element.houseInfo.length; j++) {
 								const jelement = element.houseInfo[j]
-								if ((jelement.houseName = '一楼面料仓库')) {
+								console.log(jelement,123123123)
+								if ((jelement.houseName == '一楼面料仓库')) {
 									element.yilouSum = jelement.sum
 									element.yilouCount = jelement.count
 								}
-								if ((jelement.houseName = '四楼面料仓')) {
+								if ((jelement.houseName == '四楼面料仓')) {
 									element.silouSum = jelement.sum
 									element.silouCount = jelement.count
 								}
@@ -622,6 +632,7 @@ export default {
 						{ ...res.data.data.typeStatistics[0], name: '直喷' },
 						{ ...res.data.data.typeStatistics[1], name: '热转' },
 						{ ...res.data.data.typeStatistics[2], name: '打纸' },
+						{ ...res.data.data.typeStatistics[4], name: '其他' },
 					]
 				})
 		},
@@ -938,7 +949,8 @@ export default {
 					list-style: none;
 					font-size: 12px;
 					color: #838383;
-					line-height: 30px;
+					line-height: 24px;
+					padding:6px 0;
 					span {
 						color: #3f3f3f;
 						font-weight: bold;
@@ -959,6 +971,7 @@ export default {
 				li {
 					width: 25%;
 					text-align: center;
+					line-height: 24px;
 				}
 			}
 		}