前端gjy

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -857,7 +857,9 @@ export default {
               this.dataList.outputPrivate =
                 CodeToText[this.selectedOptions1[0]]
               this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
-              this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
+              if(this.dataList.procurementPlanType=='期货'){
+                this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
+              }
               this.dataList.compId = this.compId
               this.dataList.unitPrice=this.dataList.procurementPrice
               

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -887,7 +887,9 @@ export default {
               this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
               this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
               this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
-              this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
+              if(this.dataList.procurementPlanType=='期货'){
+                this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
+              }
               this.dataList.compId = this.compId
               // this.dataList.pcFlag = 1
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')

src/views/purchasingManagement/purchaseOrderList.vue

@@ -4,9 +4,6 @@
     <BaseHeaderLayout :leftSpan="15">
       <template slot="left"> </template>
       <template slot="right">
-        <span style="width: 70px; display: inline-block; color: #8890b1"
-          >状态：</span
-        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -2038,6 +2035,9 @@ hr {
   margin-top: -3px;
   // margin-left: -10px;
 }
+/deep/.typeselect{
+  margin-right:10px;
+}
 /deep/.typeselect .el-input__inner {
   color: #8890b1;
 }

src/views/salesManagement/salesPlanOrderList.vue

@@ -4,9 +4,6 @@
     <BaseHeaderLayout :leftSpan="15">
       <template slot="left"> </template>
       <template slot="right">
-        <span style="width: 70px; display: inline-block; color: #8890b1"
-          >状态：</span
-        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -326,11 +323,19 @@
       >
         <template slot-scope="scope" >
                  <div
-              class="record"
+                  style='display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;'
               @click="nocomplete1(scope.row)"
               v-if="scope.row.procurementPlanType != '现货'&&scope.row.deliveryUnpaid != null&&scope.row.deliveryUnpaid >0">去结算</div>
                 <div
-              class="record"
+                 style='display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;'
               @click="nocomplete1(scope.row)"
               v-else-if="scope.row.procurementPlanType != '现货'&&scope.row.deliveryUnpaid != null&&scope.row.deliveryUnpaid==0">已结算</div>
           </template></el-table-column>
@@ -342,11 +347,19 @@
       >
       <template slot-scope="scope">
              <div
-              class="record"
+             style='display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;'
               @click="nocomplete(scope.row)"
               v-if="scope.row.procurementPlanType != '现货'&&scope.row.closedUnpaid != null&&scope.row.closedUnpaid >0">去结算</div>
             <div
-              class="record"
+             style='display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;'
               @click="nocomplete(scope.row)"
               v-else-if="scope.row.procurementPlanType != '现货'&&scope.row.closedUnpaid != null&&scope.row.closedUnpaid ==0">已结算</div>
           </template></el-table-column>
@@ -1944,6 +1957,9 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
+.typeselect{
+  margin-right:10px;
+}
 .button-container {
   display: flex;
   flex-wrap: nowrap;

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.121:8090/',
+        target: 'http://192.168.1.120:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',