zxz пре 3 година
родитељ
комит
ce77845848
4 измењених фајлова са 430 додато и 219 уклоњено
  1. 1 1
      src/api/V2/customer/index.js
  2. 2 2
      src/model/customer/index.js
  3. 426 215
      src/views/customer/customerList.vue
  4. 1 1
      vue.config.js

+ 1 - 1
src/api/V2/customer/index.js

@@ -3,7 +3,7 @@
 export const API_GET_CUSTOMERINFO_LOOK = '/customerInfo/selectCustomerInfo'
 
 // 设置默认定金比例
-export const API_POST_INSTALLDEPOSITRATIO = '/customerInfo/api/installDepositRatio'
+export const API_GET_INSTALLDEPOSITRATIO = '/customerInfo/api/installDepositRatio'
 
 // 编辑
 export const API_POST_EDITCUSTOMERINFO = '/customerInfo/api/editCustomerInfo'

+ 2 - 2
src/model/customer/index.js

@@ -2,7 +2,7 @@ import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
 import {
     API_GET_CUSTOMERINFO_LOOK,
-    API_POST_INSTALLDEPOSITRATIO,
+    API_GET_INSTALLDEPOSITRATIO,
     API_POST_EDITCUSTOMERINFO
 } from '@/api/V2/customer'
 // import { app } from 'electron'
@@ -11,7 +11,7 @@ import {
 export const getList = appRx.get(API_GET_CUSTOMERINFO_LOOK, errorCatcher, errorHandle, filter)
 
 // 设置默认定金比例
-export const installDepositRatio = appRx.post(API_POST_INSTALLDEPOSITRATIO, errorCatcher, errorHandle, filter)
+export const installDepositRatio = appRx.get(API_GET_INSTALLDEPOSITRATIO, errorCatcher, errorHandle, filter)
 
 // 编辑
 export const editCustomerInfo = appRx.post(API_POST_EDITCUSTOMERINFO, errorCatcher, errorHandle, filter)

+ 426 - 215
src/views/customer/customerList.vue

@@ -3,7 +3,6 @@
   <div>
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left"> </template>
-      <!-- 接单开始 -->
       <template slot="left">
         <ws-input
           v-model="searchKeyWord"
@@ -13,7 +12,6 @@
           type="input"
           class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
@@ -27,86 +25,123 @@
             src="../../../public/img/sousuo.png"
             alt=""
         /></ws-button>
-        <el-button class="bg-bottom" type="primary" size="small" @click="installRatio()"
-        >默认定金比例</el-button
-      >
-      <WinseaContentModal
-      v-model="outerVisibleEdit"
-      title="设置默认定金比例"
-      @on-cancel="handleClose"
-    >
-    
-    <div style="width:90%">
-      <div class="dingjin">定金比例(元/吨)</div> 
-      <el-input
-        type="textarea"
-        :rows="2"
-        maxlength="30"
-        placeholder="请输入定金比例"
-        v-model="auditMindEdit"
-      >
-      </el-input>
-      </div>
-      <div class="dialog-footer">
-        <el-button @click="outerVisibleEdit = false">取 消</el-button>
-        <el-button type="primary" @click="editDepositRatio()">确定</el-button>
-      </div>
-    </WinseaContentModal>
 
-<!--增加定金-->
-      <WinseaContentModal
-      v-model="outerVisibleAdd"
-      title="增加定金"
-      @on-cancel="handleClose"
-    >
-    <div class="addprice">已付定金</div> 
-     <div class="addpricejine">增加金额</div>
-    <div style="width:90%" class="zengjia">
-     
-      <el-input
-        type="textarea"
-        :rows="2"
-        maxlength="30"
-        placeholder="请输入本次增加定金金额"
-        v-model="auditMindAdd"
-      >
-      </el-input>
-    <div class="yuan">元</div>
-      </div>
-     
-      <div class="dialog-footer">
-        <el-button @click="outerVisibleAdd = false">取 消</el-button>
-        <el-button type="primary" @click="editPrice(0)">确定</el-button>
-      </div>
-    </WinseaContentModal>
+        <!--设置默认定金比例-->
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="installRatio()"
+        >
+          默认定金比例</el-button
+        >
+        <WinseaContentModal
+          v-model="outerVisibleDefaultEdit"
+          title="设置默认定金比例"
+          @on-cancel="handleClose"
+        >
+          <div style="width: 90%">
+            <div class="dingjin">定金比例(元/吨)</div>
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入定金比例"
+              v-model="depositRatio"
+            >
+            </el-input>
+          </div>
+          <div class="dialog-footer">
+            <el-button @click="outerVisibleDefaultEdit = false"
+              >取 消</el-button
+            >
+            <el-button type="primary" @click="editDepositRatio()"
+              >确定</el-button
+            >
+          </div>
+        </WinseaContentModal>
 
-    <!--退回定金-->
-      <WinseaContentModal
-      v-model="outerVisibleReturn"
-      title="退回定金"
-      @on-cancel="handleClose"
-    >
-    <div class="returnprice">可退定金</div> 
-     <div class="returnpricejine">退回金额</div>
-    <div style="width:90%" class="tuihui">
-      <el-input
-        type="textarea"
-        :rows="2"
-        maxlength="30"
-        placeholder="请输入本次退回定金金额"
-        v-model="auditMindReturn"
-      >
-      </el-input>
-    <div class="yuan">元</div>
-      </div>
-     
-      <div class="dialog-footer">
-        <el-button @click="outerVisibleReturn = false">取 消</el-button>
-        <el-button type="primary" @click="editPrice(1)">确定</el-button>
-      </div>
-    </WinseaContentModal>
-      </template>
+        <!--修改定金比例-->
+        <WinseaContentModal
+          v-model="outerVisibleEdit"
+          title="修改定金比例"
+          @on-cancel="handleClose"
+        >
+          <div style="width: 90%" class="xiugai">
+            <el-input
+              type="textarea"
+              :rows="2"
+              maxlength="30"
+              placeholder="请输入定金比例"
+              v-model="depositRatio"
+            >
+            </el-input>
+          </div>
+          <div class="dialog-footer">
+            <el-button @click="outerVisibleEdit = false">取 消</el-button>
+            <el-button type="primary" @click="editPrice(0)">确定</el-button>
+          </div>
+        </WinseaContentModal>
+
+        <!--增加定金-->
+        <WinseaContentModal
+          v-model="outerVisibleAdd"
+          title="增加定金"
+          @on-cancel="handleClose"
+        >
+          <div class="addprice">
+            已付定金
+            <template>
+              {{ this.totalDeposit }}
+            </template>
+          </div>
+          <div class="addpricejine">增加金额</div>
+          <div style="width: 90%" class="zengjia">
+            <el-input
+              type="textarea"
+              :rows="2"
+              maxlength="30"
+              placeholder="请输入本次增加定金金额"
+              v-model="money"
+            >
+            </el-input>
+            <div class="yuan">元</div>
+          </div>
+          <div class="dialog-footer">
+            <el-button @click="outerVisibleAdd = false">取 消</el-button>
+            <el-button type="primary" @click="editPrice(1)">确定</el-button>
+          </div>
+        </WinseaContentModal>
 
+        <!--退回定金-->
+        <WinseaContentModal
+          v-model="outerVisibleReturn"
+          title="退回定金"
+          @on-cancel="handleClose"
+        >
+          <div class="returnprice">
+            可退定金
+            <template>
+              {{ this.totalDeposit - this.freezingDeposit }}
+            </template>
+          </div>
+          <div class="returnpricejine">退回金额</div>
+          <div style="width: 90%" class="tuihui">
+            <el-input
+              type="textarea"
+              :rows="2"
+              maxlength="30"
+              placeholder="请输入本次退回定金金额"
+              v-model="money"
+            >
+            </el-input>
+            <div class="yuan">元</div>
+          </div>
+          <div class="dialog-footer">
+            <el-button @click="outerVisibleReturn = false">取 消</el-button>
+            <el-button type="primary" @click="editPrice(2)">确定</el-button>
+          </div>
+        </WinseaContentModal>
+      </template>
     </BaseHeaderLayout>
     <div>
       <el-table
@@ -122,38 +157,71 @@
           </template>
         </el-table-column>
         <el-table-column prop="customerName" label="客户名称">
-            <template scope="scope">
-            <span v-if="scope.row.customerName == '' || scope.row.customerName == null">{{scope.row.compName}}</span>
-             <span v-if="scope.row.compName == '' || scope.row.compName == null">{{scope.row.customerName}}</span>
+          <template scope="scope">
+            <span
+              v-if="
+                scope.row.customerName == '' || scope.row.customerName == null
+              "
+              >{{ scope.row.compName }}</span
+            >
+            <span
+              v-if="scope.row.compName == '' || scope.row.compName == null"
+              >{{ scope.row.customerName }}</span
+            >
           </template>
         </el-table-column>
         <el-table-column prop="compAddress" label="地址"></el-table-column>
         <el-table-column prop="customerPhone" label="电话"> </el-table-column>
-        <el-table-column prop="payTaxesCard" label="纳税人识别号"> </el-table-column>
-        <el-table-column prop="bankDeposit" label="开户行"> </el-table-column>
+        <el-table-column prop="payTaxesCard" label="纳税人识别号">
+          <template scope="scope">
+            <span
+              v-if="
+                scope.row.payTaxesCard == '' || scope.row.payTaxesCard == null
+              "
+            >
+              — —
+            </span>
+            {{ scope.row.payTaxesCard }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="bankDeposit" label="开户行">
+          <template slot-scope="scope">
+            {{ scope.row.bankDeposit }} - {{ scope.row.bankDepositBranch }}
+          </template>
+        </el-table-column>
         <el-table-column prop="bankCard" label="银行卡号"> </el-table-column>
-        <el-table-column prop="totalDeposit" label="总定金(元)"> </el-table-column>
-        <el-table-column prop="freezingDeposit" label="冻结定金(元)"> </el-table-column>
+        <el-table-column prop="totalDeposit" label="总定金(元)">
+        </el-table-column>
+        <el-table-column prop="freezingDeposit" label="冻结定金(元)">
+        </el-table-column>
         <el-table-column prop="depositRatio" label="定金比例(元/吨)">
           <template slot-scope="scope">
-            {{scope.row.depositRatio}}
+            {{ scope.row.depositRatio }}
             <img
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
-              @click="editClick(scope.row)"
+              @click="editClick(0, scope.row)"
               alt=""
             />
           </template>
         </el-table-column>
         <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
-        <el-table-column prop="seller" label="操作" width="280" >
-          <template>
-            <el-button class="find" type="primary" @click="editClick(1)"
-          >增加定金</el-button>
-            <el-button class="find" type="primary" @click="editClick(2)"
-          >退回定金</el-button>
+        <el-table-column prop="seller" label="操作" width="280">
+          <template slot-scope="scope">
+            <el-button
+              class="find"
+              type="primary"
+              @click="editClick(1, scope.row)"
+              >增加定金</el-button
+            >
+            <el-button
+              class="find"
+              type="primary"
+              @click="editClick(2, scope.row)"
+              >退回定金</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -170,15 +238,14 @@
   </div>
 </template>
 <script>
-import { 
+import {
   getList,
   installDepositRatio,
-  editCustomerInfo
+  editCustomerInfo,
 } from '@/model/customer/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 
-import { billoperatehis } from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -210,6 +277,7 @@ export default {
       pageSize: 10,
       deptBudgetTotal: 0,
       searchKeyWord: '',
+      outerVisibleDefaultEdit: false,
       outerVisibleEdit: false,
       outerVisibleAdd: false,
       outerVisibleReturn: false,
@@ -219,9 +287,9 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
-      auditMindEdit: '',
-      auditMindAdd: '',
-      auditMindReturn: '',
+      depositRatio: '',
+      id: '',
+      money: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       customerList: [],
@@ -233,6 +301,17 @@ export default {
         },
       },
       accessoryTFs: false,
+      customerInfo: {
+        id: '',
+        compId: '',
+        depositRatio: '',
+        flag: '',
+        money: '',
+        totalDeposit: 0,
+        freezingDeposit: 0,
+      },
+      totalDeposit: 0,
+      freezingDeposit: 0,
     }
   },
   activated() {
@@ -240,35 +319,6 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    //设置默认定金比例
-    installRatio(){
-      // installDepositRatio({
-      //     compId: sessionStorage.getItem('ws-pf_compId'),
-      //     depositRatio:this.depositRatio,
-      // })
-      this.outerVisibleEdit = true
-    },
-    editDepositRatio(){
-      installDepositRatio({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-       depositRatio:this.depositRatio,
-      })
-        .toPromise()
-        .then((response) => {
-          // this.deptCircularPage.currentPage = response.current
-          // this.deptCircularPage.pageSize = response.size
-          // this.deptBudgetTotal = response.total
-          // this.customerList = response
-          console.log('成功')
-        })
-      if (!this.auditMindEdit) {
-        this.$message({
-          message: '默认定金比例不能为空!',
-          type: 'warning',
-        })
-        return
-      }
-    },
     //查看//传参
     nocomplete(row) {
       this.$router.push({
@@ -317,6 +367,7 @@ export default {
       this.searchType = state
       this.getList()
     },
+    //列表查询
     getList() {
       getList({
         compId: sessionStorage.getItem('ws-pf_compId'),
@@ -333,61 +384,208 @@ export default {
           this.customerList = response
         })
     },
-    editClick(index) {
-      editCustomerInfo({
-          
-      })
-      .toPromise()
-        .then((response) => {
-          // this.deptCircularPage.currentPage = response.current
-          // this.deptCircularPage.pageSize = response.size
-          // this.deptBudgetTotal = response.total
-          // this.customerList = response
-          console.log('成功')
+    //设置默认定金比例
+    installRatio() {
+      this.outerVisibleDefaultEdit = true
+    },
+    editDepositRatio() {
+      if (
+        this.depositRatio < 1 ||
+        this.depositRatio > 100000 ||
+        (String(this.depositRatio).indexOf('.') != -1 &&
+          String(this.depositRatio).length -
+            (String(this.depositRatio).indexOf('.') + 1) >
+            2)
+      ) {
+        this.$message({
+          message: '默认定金比例输入错误,取值范围1-100000之间,最多两位小数',
+          type: 'warning',
         })
+        return
+      }
+      if (this.depositRatio) {
+        if (isNaN(this.depositRatio)) {
+          this.$message({
+            message: '默认定金比例非数字!',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.depositRatio) {
+          this.$message({
+            message: '默认定金比例不能为空!',
+            type: 'warning',
+          })
+          return
+        }
+        installDepositRatio({
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          depositRatio: this.depositRatio,
+        })
+          .toPromise()
+          .then((response) => {
+            this.outerVisibleDefaultEdit = false
+            this.getList()
+            this.$message.success('设置默认定金比例成功')
+          })
+      }
+    },
+    //编辑
+    editClick(index, row) {
+      this.id = row.id
+      this.depositRatio = row.depositRatio
+      this.totalDeposit = row.totalDeposit
+      this.freezingDeposit = row.freezingDeposit
+
       //更改定金比例
-      if(index == 0){
-          this.outerVisibleEdit = true
+      if (index == 0) {
+        this.outerVisibleEdit = true
+        this.customerInfo.flag = 0
       }
       //增加定金
-      else if(index == 1){
-          this.outerVisibleAdd = true
+      else if (index == 1) {
+        this.outerVisibleAdd = true
+        this.customerInfo.flag = 1
       }
       //退回定金
-      else{
+      else {
         this.outerVisibleReturn = true
+        this.customerInfo.flag = 2
       }
     },
-    editPrice(asdf){
+    editPrice(asdf) {
+      this.customerInfo.id = this.id
+      this.customerInfo.compId = this.compId
+      this.customerInfo.depositRatio = this.depositRatio
+      this.customerInfo.money = this.money
+      this.customerInfo.totalDeposit = this.totalDeposit
+      this.customerInfo.freezingDeposit = this.freezingDeposit
+      //修改定金比例
+      if (asdf == 0) {
+        if (
+          this.depositRatio < 0 ||
+          this.depositRatio > 100000 ||
+          (String(this.depositRatio).indexOf('.') != -1 &&
+            String(this.depositRatio).length -
+              (String(this.depositRatio).indexOf('.') + 1) >
+              2)
+        ) {
+          this.$message({
+            message: '定金比例输入错误,取值范围1-100000之间,最多两位小数',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.depositRatio) {
+          if (isNaN(this.depositRatio)) {
+            this.$message({
+              message: '定金比例非数字!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (!this.depositRatio) {
+          this.$message({
+            message: '定金比例不能为空!',
+            type: 'warning',
+          })
+          return
+        }
+      }
       //增加定金
-        if(asdf == 0){
-            if (!this.auditMindAdd) {
-              this.$message({
-              message: '增加金额不能为空!',
+      else if (asdf == 1) {
+        if (
+          this.money < 0 ||
+          this.money > 100000000 ||
+          (String(this.money).indexOf('.') != -1 &&
+            String(this.money).length - (String(this.money).indexOf('.') + 1) >
+              2)
+        ) {
+          this.$message({
+            message: '增加金额输入错误,取值范围1-1亿之间,最多两位小数',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.money) {
+          if (isNaN(this.money)) {
+            this.$message({
+              message: '增加金额非数字!',
               type: 'warning',
             })
             return
-            }
           }
+        }
+        if (!this.money) {
+          this.$message({
+            message: '增加金额不能为空!',
+            type: 'warning',
+          })
+          return
+        }
+      }
       //退回定金
-      if(asdf == 1){
-          if (!this.auditMindOneReturn) {
+      if (asdf == 2) {
+        if (
+          this.money < 0 ||
+          this.money > 100000000 ||
+          (String(this.money).indexOf('.') != -1 &&
+            String(this.money).length - (String(this.money).indexOf('.') + 1) >
+              2)
+        ) {
+          this.$message({
+            message: '退回金额输入错误,取值范围1-1亿之间,最多两位小数',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.money) {
+          if (isNaN(this.money)) {
             this.$message({
+              message: '退回金额非数字!',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (!this.money) {
+          this.$message({
             message: '退回金额不能为空!',
             type: 'warning',
-            })
+          })
+          return
+        }
+        if (this.money > this.totalDeposit - this.freezingDeposit) {
+          this.$message({
+            message: '退回金额不能大于可退金额!',
+            type: 'warning',
+          })
           return
         }
       }
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
+      editCustomerInfo(this.customerInfo)
         .toPromise()
         .then((response) => {
-          this.historyList = response
+          this.outerVisibleAdd = false
+          this.outerVisibleReturn = false
+          this.outerVisibleEdit = false
+          this.getList()
+          //修改定金比例
+          if (asdf == 0) {
+            this.$message.success('修改定金比例成功')
+          }
+          //增加定金
+          else if (asdf == 1) {
+            this.$message.success('增加成功')
+          }
+          //退回定金
+          if (asdf == 2) {
+            this.$message.success('退回成功')
+          }
         })
     },
-     find() {
+    find() {
       this.currentPage = 1
       this.getList()
     },
@@ -505,9 +703,8 @@ export default {
 }
 .el-input--small .el-input__inner {
   margin-left: 20px;
-  
 }
-.dialog-footer{
+.dialog-footer {
   margin-top: 21px;
 }
 .el-range-editor--small.el-input__inner {
@@ -527,80 +724,94 @@ export default {
   margin-right: 10px;
 }
 
+/deep/.zengjia .el-textarea__inner {
+  display: block;
+  padding: 13px 17px;
+  line-height: 0.5;
+  box-sizing: border-box;
+  width: 80%;
+  font-size: inherit;
+  color: #606266;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  margin-left: 180px;
+}
 
-/deep/.zengjia .el-textarea__inner{
-display: block;
-    padding: 13px 17px;
-    line-height: 0.5;
-    box-sizing: border-box;
-    width: 80%;
-    font-size: inherit;
-    color: #606266;
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #dcdfe6;
-    border-radius: 4px;
-    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
-    margin-left: 180px;
+/deep/.xiugai .el-textarea__inner {
+  display: block;
+  padding: 13px 17px;
+  line-height: 0.5;
+  box-sizing: border-box;
+  width: 80%;
+  font-size: inherit;
+  color: #606266;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  margin-left: 180px;
 }
 
-/deep/.tuihui .el-textarea__inner{
-display: block;
-    padding: 13px 17px;
-    line-height: 0.5;
-    box-sizing: border-box;
-    width: 80%;
-    font-size: inherit;
-    color: #606266;
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #dcdfe6;
-    border-radius: 4px;
-    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
-    margin-left: 180px;
-}
-/deep/.dingjin{
+/deep/.tuihui .el-textarea__inner {
+  display: block;
+  padding: 13px 17px;
+  line-height: 0.5;
+  box-sizing: border-box;
+  width: 80%;
+  font-size: inherit;
+  color: #606266;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  margin-left: 180px;
+}
+/deep/.dingjin {
   width: 98px;
   margin-left: 30px;
 }
-/deep/.el-textarea__inner{
-display: block;
-    padding: 13px 17px;
-    line-height: 0.5;
-    box-sizing: border-box;
-    width: 90%;
-    font-size: inherit;
-    color: #606266;
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #dcdfe6;
-    border-radius: 4px;
-    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
-    margin-left: 180px;
-}
-/deep/.addprice{
+/deep/.el-textarea__inner {
+  display: block;
+  padding: 13px 17px;
+  line-height: 0.5;
+  box-sizing: border-box;
+  width: 90%;
+  font-size: inherit;
+  color: #606266;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  margin-left: 180px;
+}
+/deep/.addprice {
   width: 98px;
   margin-left: 50px;
 }
-/deep/.returnprice{
+/deep/.returnprice {
   width: 98px;
   margin-left: 50px;
 }
-/deep/.yuan{
-    width: 10px;
-    margin-left: 1400px;
-    margin-top: -36px;
+/deep/.yuan {
+  width: 10px;
+  margin-left: 1400px;
+  margin-top: -36px;
 }
-/deep/.addpricejine{
+/deep/.addpricejine {
   width: 98px;
   margin-left: 50px;
 }
-/deep/.returnpricejine{
+/deep/.returnpricejine {
   width: 98px;
   margin-left: 50px;
 }
 /deep/.typeselect .el-input__inner {
   color: #8890b1;
 }
-
 </style>

+ 1 - 1
vue.config.js

@@ -145,7 +145,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.116:8090/',
+        target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',