前端gjy

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/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,14 +999,14 @@ export default {
         postreplanishent({
           customerConfirmationStatusFlag:
             this.modification[0].customerConfirmationStatusFlag,
-          purchaseReceiptReport: {
+            id:this.modification[0].id,
             contractNo: this.carryoverlist.contractNo,
             carryOverWeight: this.carryoverlist.carryOverWeight,
-          },
           amountNotPayable: this.modification[0].amountNotPayable,
         })
           .toPromise()
           .then((response) => {
+            this.dialogFormVisible11=false
             this.$message.success('结转成功')
             this.getList()
           })
@@ -1041,11 +1043,11 @@ export default {
         this.$message.warning('请选择一条要结转的条目')
       } else {
         this.dialogFormVisible11 = true
-        this.carryovercontractnolist = this.contractNoList.records.filter(
-          (item) => {
-            return this.modification[0].id != item.id
-          }
-        )
+        // this.carryovercontractnolist = this.contractNoList.records.filter(
+        //   (item) => {
+        //     return this.modification[0].id != item.id
+        //   }
+        // )
       }
     },
     handleSelectionChange(val) {

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>

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.120:8090/',
+        target: 'http://192.168.1.110:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',