Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/purchaseContractAdd.vue

@@ -46,7 +46,7 @@
         <!--关联合同-->
         <ws-form-item prop="agreementNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">
           <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
-            <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.agreementNo"
+            <ws-option v-for="item in contractNoList"  :key="item.id" :label="item.contractNo"
               :value="item.contractNo"></ws-option>
           </ws-select>
         </ws-form-item>
@@ -464,6 +464,8 @@
         agreementType: '',
         deptBudgetList: {
           deliverType: '1',
+          sourceGoods:'',
+          placeDelivery:'',
           agreementType: '采购合同',
           addressUrl: '',
           sellerPhone:'',
@@ -656,6 +658,17 @@
         this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.weight
       },
       returnsales() {
+        this.deptBudgetList = {
+                  deliverType: '1',
+                  agreementType: '采购合同',
+                  finalTradingVolume: 0,
+                  totalContractPrice: 0,
+                  contractGoodsInfo: {
+                    goodsName: '',
+                  },
+                  contractProcessInfo: {},
+                  addressUrl: '',
+                }
         this.$router.push({
           path: 'buyContract'
         })
@@ -718,6 +731,8 @@
           })
       },
       selectRelation(e) {
+        // console.log(this.contractNoList)
+        // debugger
         for (var i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
             this.deptBudgetList = this.contractNoList[i]

src/views/contractManagement/salesContractAdd.vue

@@ -35,7 +35,7 @@
           <!--关联合同-->
           <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">
             <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
-              <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.agreementNo"
+              <ws-option v-for="item in contractNoList" :key="item.id" :label="item.contractNo"
                 :value="item.contractNo"></ws-option>
             </ws-select>
           </ws-form-item>
@@ -585,6 +585,17 @@
         this.selectedOptions1 = value
       },
       returnsales() {
+        this.deptBudgetList = {
+                  deliverType: '1',
+                  agreementType: '采购合同',
+                  finalTradingVolume: 0,
+                  totalContractPrice: 0,
+                  contractGoodsInfo: {
+                    goodsName: '',
+                  },
+                  contractProcessInfo: {},
+                  addressUrl: '',
+                }
         this.$router.push({
           path: 'salesContract',
         })

src/views/customerFundManagement/customerFundAdd.vue

@@ -39,7 +39,7 @@
             <ws-input
               v-model="customerList.compName"
               placeholder="请输入公司名称"
-              maxlength="15"
+              maxlength="30"
               size="small"
               :disabled="disabled"
             />
@@ -186,7 +186,7 @@
             <ws-input
               v-model="customerList.payeeName"
               placeholder="请输入收款人姓名"
-              maxlength="15"
+              maxlength="30"
               size="small"
               :disabled="disabled"
             />

src/views/customerFundManagement/customerFundEdit.vue

@@ -39,7 +39,7 @@
             <ws-input
               v-model="customerList.compName"
               placeholder="请输入公司名称"
-              maxlength="15"
+              maxlength="30"
               size="small"
               :disabled="disabled"
             />
@@ -184,7 +184,7 @@
             <ws-input
               v-model="customerList.payeeName"
               placeholder="请输入收款人姓名"
-              maxlength="15"
+              maxlength="30"
               size="small"
               :disabled="disabled"
             />

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -170,7 +170,7 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.selectVal) {
           localStorage.setItem(
-            'houseSelfCollect_house',
+            'houseSelfCollect_house1',
             JSON.stringify(this.warehouseList[i])
           )
           this.warehouseName = this.warehouseList[i].warehouseName
@@ -229,7 +229,7 @@ export default {
           // if(this.userJurisdiction){
           //   this.warehouseList.unshift({warehouseName:response[0].flag})
           // }
-          let _wareHouse = localStorage.getItem('houseSelfCollect_house')
+          let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
           if (_wareHouse) {
             _wareHouse = JSON.parse(_wareHouse)
             this.selectVal = _wareHouse.id
@@ -283,14 +283,14 @@ export default {
       })
         .toPromise()
         .then(response => {
-           let _data = localStorage.getItem('houseSelfCollect_house')
-           _data = JSON.parse(localStorage.getItem('houseSelfCollect_house'))
+           let _data = localStorage.getItem('houseSelfCollect_house1')
+           _data = JSON.parse(localStorage.getItem('houseSelfCollect_house1'))
            if(_data.allowEdit==0){
              _data.allowEdit = 1
            }else{
              _data.allowEdit = 0
            } 
-            localStorage.setItem('houseSelfCollect_house',JSON.stringify(_data))
+            localStorage.setItem('houseSelfCollect_house1',JSON.stringify(_data))
             this.getWarehouseSelf()
           // this.tableData = response.records
         })

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -100,6 +100,14 @@
               size="small"
               :disabled="disabled"
             />
+          </ws-form-item>
+           <ws-form-item label="所属供应商" span="1" prop="supplier" label-width="80px">
+            <ws-input v-model="customerList.supplier" placeholder="请输入供应商姓名" maxlength="15" size="small"
+              :disabled="disabled" />
+          </ws-form-item>
+           <ws-form-item label="供应商电话 " span="1" prop="supplierPhone" label-width="80px">
+            <ws-input v-model="customerList.supplierPhone" placeholder="请输入供应商电话" maxlength="15" size="small"
+              :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="银行卡号" span="1" prop="bankCard">
             <ws-input

src/views/houseSelfCollect/inspectInfo.vue

@@ -871,8 +871,12 @@
             this.customerList = []
             let customer = response
             for (let i = 0; i < response.length; i++) {
-              customer =
-                response[i].customerName + '(' + response[i].customerPhone + ')'
+              if(response[i].supplier){
+                customer =  response[i].customerName + '(' + response[i].customerPhone + ')'+'-'+response[i].supplier
+              }
+              else{
+                customer = response[i].customerName + '(' + response[i].customerPhone + ')'
+              }
               this.customerList.push({
                 valueKey: i,
                 value: customer,

src/views/houseSelfCollect/inspectionManagement.vue

@@ -211,11 +211,7 @@
 						this.cangid = this.warehouseList[i].id
 						this.allowEdit = this.warehouseList[i].allowEdit
 						this.WAREHOUSE[1].payname = this.warehouseList[i].value
-					}
-				}
-				for (let i = 0; i < this.warehouseList1.length; i++) {
-					if (this.warehouseList1[i].warehouseName == e) {
-						localStorage.setItem('houseSelfCollect_house', JSON.stringify(this.warehouseList[i]))
+						localStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
 					}
 				}
 				this.getList()
@@ -265,7 +261,7 @@
 					.then((response) => {
 						this.warehouseList1 = response
 						this.warehouseList = []
-						let _wareHouse = localStorage.getItem('houseSelfCollect_house')
+						let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
 						_wareHouse = JSON.parse(_wareHouse)
 						if (_wareHouse) {
 								this.cangid = _wareHouse.id

src/views/houseSelfCollect/paymentManagement.vue

@@ -709,7 +709,7 @@ import download from '../../components/WsDownload/download'
         }
       },
       getWarehouse() {
-        let _wareHouse = localStorage.getItem('houseSelfCollect_house')
+        let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
         _wareHouse = JSON.parse(_wareHouse)
         selectWarehouseSelf({
             compId: localStorage.getItem('ws-pf_compId')
@@ -719,7 +719,7 @@ import download from '../../components/WsDownload/download'
             this.warehouseList = response
             if (_wareHouse) {
               this.warehouseNameKey = _wareHouse.id
-              this.warehouseName = _wareHouse.warehouseName
+              this.warehouseName = _wareHouse.value
             } else {
               this.warehouseNameKey = this.warehouseList[0].id
               if (this.warehouseName) {
@@ -1070,8 +1070,13 @@ import download from '../../components/WsDownload/download'
           if (this.warehouseList[i].id == this.warehouseNameKey) {
             this.warehouseName = this.warehouseList[i].warehouseName
             localStorage.setItem(
-              'houseSelfCollect_house',
-              JSON.stringify(this.warehouseList[i])
+              'houseSelfCollect_house1',
+              JSON.stringify({value:this.warehouseList[i].warehouseName,
+                warehouseId: this.warehouseList[i].id,
+                allowEdit: this.warehouseList[i].allowEdit,
+                monitorUrl1: this.warehouseList[i].monitorUrl1,
+                monitorUrl2: this.warehouseList[i].monitorUrl2,
+                warehouseNo:this.warehouseList[i].commonWarehouseNo})
             )
             this.WAREHOUSE[3].payname = this.warehouseList[i].id
           }

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -259,14 +259,6 @@
         // 提交类型
         readonly: true,
         tranPriceApprove: {},
-        rules: {
-          netWeight: [{
-            required: true,
-            type: 'number',
-            message: '请输入活动名称',
-            trigger: 'blur',
-          }, ],
-        },
         size: 10,
         compId: localStorage.getItem('ws-pf_compId'),
         date: {

src/views/warehouse/costmanagement.vue

@@ -82,14 +82,14 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
+      <!-- <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
       :current-page="currentPage"
       :page-size="pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       :total="deptBudgetTotal"
-    ></el-pagination>
+    ></el-pagination> -->
       <el-dialog :close-on-click-modal='false' title="修改加权成本价格" :visible.sync="editvisible">
         <el-form >
           <el-form-item label="价格（元/吨）" >
@@ -351,16 +351,18 @@ export default {
         .toPromise()
         .then((response) => {
           var arr=[]
-          for (let i = 0; i < response.records.length; i++) {
-            if(response.records[i].storage!=0){
-              response.records[i].value=(response.records[i].cost*response.records[i].storage).toFixed(1)
-              arr.push(response.records[i])
+          for (let i = 0; i < response.length; i++) {
+            if(response[i].storage!=0){
+              response[i].value=(response[i].cost*response[i].storage).toFixed(1)
+              arr.push(response[i])
+            }else{
+              response[i].value=0
+              arr.push(response[i])
             }
             
           }
           this.getSpanArr(arr)
           this.warehouseList = arr
-          this.deptBudgetTotal=response.total
         })
     },
     handleExamine(row) {