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

src/views/customer/customerList.vue

@@ -140,7 +140,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="customerName" label="客户名称">
-          <template scope="scope">
+          <!-- <template scope="scope">
             <span
               v-if="
                 scope.row.customerName == '' || scope.row.customerName == null
@@ -151,7 +151,7 @@
               v-if="scope.row.compName == '' || scope.row.compName == null"
               >{{ scope.row.customerName }}</span
             >
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="compAddress" label="地址"></el-table-column>
         <el-table-column prop="customerPhone" label="电话"> </el-table-column>

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -272,7 +272,7 @@
 </template>
 <script>
 import { procurementAdd } from '@/model/purchasingManagement/index'
-import { regionData,provinceAndCityDataPlus, CodeToText, TextToCode } from 'element-china-area-data'
+import { regionData,provinceAndCityData, CodeToText, TextToCode } from 'element-china-area-data'
 import { packList } from '@/model/contarct/index'
 import { getwarehousename } from '@/model/tasksport/index'
 import Pagination from '@/components/Pagination'
@@ -306,7 +306,7 @@ export default {
       // 年
       year: '',
       options_: regionData,
-      options1_:provinceAndCityDataPlus,
+      options1_:provinceAndCityData,
       packingTypeList: '',
       procurementPlanTypeList: '',
       freightPayerList: '',
@@ -515,9 +515,8 @@ export default {
     },
     handleChange1(value) {
       this.selectedOptions1 = value
-      this.dataList.receivePrivate = CodeToText[value[0]]
-      this.dataList.receiveCity = CodeToText[value[1]]
-      this.dataList.receiveArea = CodeToText[value[2]]
+      this.dataList.outputPrivate = CodeToText[value[0]]
+      this.dataList.outputCity = CodeToText[value[1]]
     },
     sendWarehousechange(e) {
       for (let i = 0; i < this.warehouseList.length; i++) {

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -345,7 +345,7 @@ import {
   regionData,
   CodeToText,
   TextToCode,
-  provinceAndCityDataPlus,
+  provinceAndCityData,
 } from 'element-china-area-data'
 import { packList } from '@/model/contarct/index'
 import Pagination from '@/components/Pagination'
@@ -383,7 +383,7 @@ export default {
       showType: true,
       // 年
       year: '',
-      options1_: provinceAndCityDataPlus,
+      options1_: provinceAndCityData,
       options_: regionData,
       packingTypeList: '',
       procurementPlanTypeList: '',
@@ -587,9 +587,8 @@ export default {
     },
     handleChange1(value) {
       this.selectedOptions1 = value
-      this.dataList.receivePrivate = CodeToText[value[0]]
-      this.dataList.receiveCity = CodeToText[value[1]]
-      this.dataList.receiveArea = CodeToText[value[2]]
+      this.dataList.outputPrivate = CodeToText[value[0]]
+      this.dataList.outputCity = CodeToText[value[1]]
     },
     submit() {
       if (this.outputYear) {

src/views/salesManagement/salesPlanAdd.vue

@@ -340,7 +340,7 @@
 import { saleAdd } from '@/model/salesManagement/index'
 import {
   regionData,
-  provinceAndCityDataPlus,
+  provinceAndCityData,
   CodeToText,
   TextToCode,
 } from 'element-china-area-data'
@@ -375,7 +375,7 @@ export default {
       // 年
       year: '',
       options_: regionData,
-      options1_: provinceAndCityDataPlus,
+      options1_: provinceAndCityData,
       packingTypeList: '',
       salePlanTypeList: '',
       freightPayerList: '',
@@ -592,9 +592,8 @@ export default {
     },
     handleChange1(value) {
       this.selectedOptions1 = value
-      this.dataList.sendPrivate = CodeToText[value[0]]
-      this.dataList.sendCity = CodeToText[value[1]]
-      this.dataList.sendArea = CodeToText[value[2]]
+      this.dataList.outputPrivate = CodeToText[value[0]]
+      this.dataList.outputCity = CodeToText[value[1]]
     },
     sendWarehousechange(e) {
       for (let i = 0; i < this.warehouseList.length; i++) {

src/views/salesManagement/salesPlanEdit.vue

@@ -288,7 +288,7 @@ import {
   saleLook,
   saleEdit,
 } from '@/model/salesManagement/index'
-import { regionData, CodeToText, TextToCode ,provinceAndCityDataPlus} from 'element-china-area-data'
+import { regionData, CodeToText, TextToCode ,provinceAndCityData} from 'element-china-area-data'
 import Pagination from '@/components/Pagination'
 import { packList } from '@/model/contarct/index'
 import { mapActions, mapGetters, mapState } from 'vuex'
@@ -325,7 +325,7 @@ export default {
       showType: true,
       // 年
       year: '',
-      options1_: provinceAndCityDataPlus,
+      options1_: provinceAndCityData,
       options_: regionData,
       contractNoList: [],
       deptBudgetTotal: 0,
@@ -530,9 +530,8 @@ export default {
     },
     handleChange1(value) {
       this.selectedOptions1 = value
-      this.dataList.sendPrivate = CodeToText[value[0]]
-      this.dataList.sendCity = CodeToText[value[1]]
-      this.dataList.sendArea = CodeToText[value[2]]
+      this.dataList.outputPrivate = CodeToText[value[0]]
+      this.dataList.outputCity = CodeToText[value[1]]
     },
     submit() {
       if (this.outputYear) {

src/views/salesManagement/salesPlanOrderList.vue

@@ -85,7 +85,7 @@
         prop="unitPrice"
         label="单价(元/吨)"
       >
-        <!--改价记录-->
+        <!--改价记录--> 
         <template slot-scope="scope">
           {{ scope.row.unitPrice }}
           <i
@@ -910,13 +910,16 @@
     </el-dialog>
     <!--改价记录-->
     <el-dialog
-      width="30%"
+      width="10%"
       title="改价记录"
       :visible.sync="dialogFormVisible5"
       :append-to-body="true"
     >
       <div v-for="item in pricechange">
-        <div>{{ item.priceType }}{{ item.price }}</div>
+        <div>{{ item.priceType }}</div>
+        <div class="price">
+          {{ item.price }}
+        </div>
         <div>{{ item.updateDate }}</div>
       </div>
     </el-dialog>
@@ -2090,4 +2093,8 @@ hr {
   background-color: #fff;
   height: 50px;
 }
+.price {
+  margin-left: 97px;
+  margin-top: -19px;
+}
 </style>

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -34,7 +34,7 @@
           " @click="carryover">补货结转</ws-button>
         <ws-button type="primary" v-hasPermission="
             `report.procurementInReport.view`
-          " @click="handleAudit()">审核</ws-button> -->
+          " @click="handleAudit()">审核</ws-button> 
         <ws-button  type="primary"  v-hasPermission="
             `report.procurementInReport.view`
           " @click="handlepass1()">通过</ws-button>
@@ -113,7 +113,9 @@
           class="table_td"
           prop="carNo"
           label="车牌号"
-        ></el-table-column>
+        ><template slot-scope="scope">
+              {{scope.row.carNo}}({{scope.row.tranCarNo}})
+              </template></el-table-column>
         <el-table-column
           class="table_td"
           prop="warehousingDate"
@@ -997,15 +999,20 @@ export default {
         postreplanishent({
           customerConfirmationStatusFlag:
             this.modification[0].customerConfirmationStatusFlag,
-          purchaseReceiptReport: {
+            id:this.modification[0].id,
+            contractNo:this.modification[0].contractNo,
+            carryOverWeight: this.carryoverlist.carryOverWeight,
+            purchaseReceiptReport: {
             contractNo: this.carryoverlist.contractNo,
             carryOverWeight: this.carryoverlist.carryOverWeight,
-          },
+            },
           amountNotPayable: this.modification[0].amountNotPayable,
         })
           .toPromise()
           .then((response) => {
+            this.dialogFormVisible11=false
             this.$message.success('结转成功')
+            this.dialogFormVisible11 = false
             this.getList()
           })
       } else if (this.carryovercontractnolist.length <=0){
@@ -1038,11 +1045,13 @@ export default {
         this.$message.warning('请选择一条要结转的条目')
       } else {
         this.dialogFormVisible11 = true
+        console.log(this.contractNoList.records)
         this.carryovercontractnolist = this.contractNoList.records.filter(
           (item) => {
             return this.modification[0].id != item.id
           }
         )
+        
       }
     },
     handleSelectionChange(val) {
@@ -1144,6 +1153,7 @@ export default {
       // }else if(this.roleId=="4ef070439cd64784bce8844fd3f0f8e1"){
       //   this.roleFlag=''
       // }
+      
       getpurchreceipt({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
@@ -1156,7 +1166,13 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].identification = 'false'
+            response.records[i].settlementPrice = response.records[i].unitPrice 
+            - Math.abs(response.records[i].basisPrice)
+            - Math.abs(response.records[i].unloadingCharge)
+            - Math.abs(response.records[i].invoiceFee)
+            - Math.abs(response.records[i].deductionAmount)
           }
+          
           this.deptBudgetTotal=response.total
           this.warehouseList = response
         })

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -92,7 +92,11 @@
           <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
           <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
           <el-table-column class="table_td" prop="positionNumber" label="仓位号"></el-table-column>
-          <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
+          <el-table-column class="table_td" prop="carNo" label="车牌号">
+            <template slot-scope="scope">
+              {{scope.row.carNo}}({{scope.row.tranCarNo}})
+              </template>
+          </el-table-column>
           <el-table-column class="table_td" prop="retrievalDate" label="出库日期"></el-table-column>
           <el-table-column width='100' class="table_td" prop="protein" label="蛋白(%)>="></el-table-column>
           <el-table-column width='100' class="table_td" prop="waterContent" label="水分(%)>="></el-table-column>
@@ -394,13 +398,12 @@ export default {
     this.getList()
     this.showType = this.isShow
   },
-  computed:{
-    sum:function(){
-        this.amendlist.settlementPrice = Number(
-          this.amendlist.unitPrice )+ Number(this.amendlist.basisPrice )+ Number(this.amendlist.invoiceFee)
-    }
-
-  },
+  // computed:{
+  //   sum:function(){
+  //       this.amendlist.settlementPrice = Number(
+  //         this.amendlist.unitPrice )+ Number(this.amendlist.basisPrice )+ Number(this.amendlist.invoiceFee)
+  //    }
+  // },
   methods: {
     selectInit(row){
 //在这里一定要记得类型匹配的上。
@@ -833,6 +836,11 @@ export default {
       })
         .toPromise()
         .then(response => {
+          for (var i = 0; i < response.records.length; i++) {
+            response.records[i].settlementPrice = response.records[i].unitPrice 
+            + response.records[i].basisPrice
+            + response.records[i].invoiceFee
+          }
           this.deptBudgetTotal=response.total
           this.warehouseList = response
         })