zhongtianhaoyuan 4 rokov pred
rodič
commit
85b4016fac

+ 4 - 11
src/views/contractManagement/purchaseContractEdit.vue

@@ -419,10 +419,10 @@
           <h3>流程信息</h3>
         </div>
         <ws-info-table>
-          <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
+          <ws-form-item label="已付款(元)" span="1" prop="mildewGrain">
             <ws-input
-              v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
-              placeholder="请输入合同收入(元)"
+              v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+              placeholder="请输入已付款(元)"
               maxlength="100"
               size="small"
             />
@@ -451,14 +451,7 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item label="未回款(元)" span="1" prop="mildewGrain"
-            ><ws-input
-              v-model="deptBudgetList.contractProcessInfo.mildewGrain"
-              placeholder="请输入已完成发货量(吨)"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
+        
           <ws-form-item
             label="已完成发运量(吨)"
             span="1"

+ 4 - 4
src/views/contractManagement/purchaseContractExamine.vue

@@ -108,11 +108,11 @@
         <ws-form-item label="签订日期" span="1" prop="signingDate">
           {{ deptBudgetList.signingDate }}
         </ws-form-item>
-        <ws-form-item label="最终实际交易量(吨)" span="1" prop="TradingVolume">
-          {{ deptBudgetList.sourceRegion }}
+        <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
+          {{ deptBudgetList.finalTradingVolume }}
         </ws-form-item>
-        <ws-form-item label="临时仓库负责人" span="1" prop="sourceRegion">
-          {{ deptBudgetList.sourceRegion }}
+        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge">
+          {{ deptBudgetList.personCharge }}
         </ws-form-item>
       </ws-info-table>
       <!--面试信息-->

+ 0 - 1
src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -240,7 +240,6 @@ export default {
   },
   data() {
     return {
-      staffList: [],
       deptBudgetList: {
         totalStorage: 0,
       },

+ 8 - 6
src/views/warehouse/warehouseManagementAdd.vue

@@ -54,7 +54,7 @@
             @change="selectstaff"
           >
             <el-option
-              v-for="item in personCharge"
+              v-for="item in options"
               :key="item.value"
               :label="item.staffName"
               :value="item.staffName"
@@ -230,7 +230,6 @@ export default {
   data() {
     let self = this
     return {
-      staffList: [],
       deptBudgetList: {
         totalStorage: 0,
       },
@@ -242,6 +241,8 @@ export default {
       window: '',
       radio: 1,
       personCharge: [],
+      options: [],
+      staffList: [],
       polygons: [
         {
           pName: 'Geolocation', //定位
@@ -280,6 +281,7 @@ export default {
           },
         ],
       },
+
       appendixIdsAdd: '',
       size: 10,
       value1: '',
@@ -601,8 +603,8 @@ export default {
                 this.deptBudgetList.warehousePositionInfoList =
                   this.freightspace
                 this.deptBudgetList.totalStorage = this.totalStorage
-                if(this.radio == 2){
-                  this.deptBudgetList.warehousetype ==2
+                if (this.radio == 2) {
+                  this.deptBudgetList.warehousetype == 2
                 }
 
                 increase(this.deptBudgetList)
@@ -677,8 +679,8 @@ export default {
         .toPromise()
         .then((response) => {
           // this.agent = response
-          //           this.options = response
-          //            this.staffList = response
+          this.options = response
+          this.staffList = response
           this.personCharge = response
         })
     },

+ 2 - 2
src/views/warehouse/warehouseManagementRecord.vue

@@ -70,7 +70,7 @@
         <div
           class="record"
           :class="{ active: status == 2 }"
-          @click="record(1, 2)"
+          @click="record(2, 2)"
         >
           <img
             v-if="status != 2"
@@ -90,7 +90,7 @@
         <div
           class="record"
           :class="{ active: status == 3 }"
-          @click="record(2, 3)"
+          @click="record(3, 3)"
         >
           <img
             v-if="status != 3"

+ 1 - 1
vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.115:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',