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>
@@ -656,6 +656,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 +729,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"
             />

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) {