前端gjy

src/api/V2/statisticalReport/index.js

@@ -36,3 +36,16 @@ export const API_POST_CLOSECOLLMONEY = '/purchaseClosingReport/api/collectMoney'
 export const API_POST_OPENINVOICE = '/purchaseReceiptReport/api/openInvoice'
 //采购入库批量开发票
 export const API_POST_BATCHOPENINVOICE = '/purchaseReceiptReport/api/openInvoiceList'
+
+//销售出库报表
+export const API_GET_SALELIST = '/salesDeliveryReport/selectSalesDeliveryReport'
+// 销售出库出纳收款
+export const API_POST_CASHIER_PAYMENT = '/salesDeliveryReport/api/collectMoney'
+// 销售出库开发票
+export const API_POST_SALES_INVOICING = '/salesDeliveryReport/api/openInvoice'
+// 销售出库批量开发票
+export const API_POST_SALES_BATCH_INVOICING = '/salesDeliveryReport/api/openInvoiceList'
+// 销售出库最终结算价
+export const API_POST_FINAL_SETTLEMENT_PRICE = '/salesDeliveryReport/api/editSalesDeliveryReport'
+// 销售出库审核
+export const API_POST_ISSUE_APPROVAL = '/salesDeliveryReport/api/examineSalesDeliveryReport'

src/model/statisticalReport/index.js

@@ -16,7 +16,14 @@ import {
     API_POST_CLOSEPAYMONEY,
     API_POST_CLOSECOLLMONEY,
     API_POST_OPENINVOICE,
-    API_POST_BATCHOPENINVOICE
+    API_POST_BATCHOPENINVOICE,
+    API_GET_SALELIST,
+    API_POST_CASHIER_PAYMENT,
+    API_POST_SALES_INVOICING,
+    API_POST_SALES_BATCH_INVOICING,
+    API_POST_FINAL_SETTLEMENT_PRICE,
+    API_POST_ISSUE_APPROVAL
+
 } from '@/api/V2/statisticalReport'
 //采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -49,4 +56,21 @@ export const closecollmoney = appRx.post(API_POST_CLOSECOLLMONEY, errorCatcher,
 //采购入库开发票
 export const postopeninvoice = appRx.post(API_POST_OPENINVOICE, errorCatcher, errorHandle, filter)
 //采购入库批量开发票
-export const postbatchopeninvoice = appRx.post(API_POST_BATCHOPENINVOICE, errorCatcher, errorHandle, filter)
+export const postbatchopeninvoice = appRx.post(API_POST_BATCHOPENINVOICE, errorCatcher, errorHandle, filter)
+
+
+
+//销售出库报表
+export const salelist = appRx.get(API_GET_SALELIST, errorCatcher, errorHandle, filter)
+//销售出库出纳收款
+export const cashierpayment = appRx.post(API_POST_CASHIER_PAYMENT, errorCatcher, errorHandle, filter)
+//销售出库开发票
+export const salesinvoicing = appRx.post(API_POST_SALES_INVOICING, errorCatcher, errorHandle, filter)
+//销售出库批量开发票
+export const salesbatchinvoicing = appRx.post(API_POST_SALES_BATCH_INVOICING, errorCatcher, errorHandle, filter)
+//销售出库最终结算价
+export const finalsettlementprice = appRx.post(API_POST_FINAL_SETTLEMENT_PRICE, errorCatcher, errorHandle, filter)
+//销售出库审核
+export const issueapproval = appRx.post(API_POST_ISSUE_APPROVAL, errorCatcher, errorHandle, filter)
+
+

src/views/financialManagement/collectionManagementList.vue

@@ -1,12 +1,13 @@
  //收款管理
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="8">
+    <BaseHeaderLayout :leftSpan="15">
+    <template slot="left"> </template>
       <template slot="right">
-        <span style="width: 142px; display: inline-block; color: #8890b1">状态：</span>
+        <span style="width: 91px; display: inline-block;color: #8890B1;">状态：</span>
         <ws-select
           v-model="searchTypeText"
-          placeholder
+          placeholder=""
           class="typeselect"
           @change="selecttaskType"
           :value="searchType"
@@ -16,7 +17,7 @@
             :key="item.value"
             :label="item.value"
             :value="item.value"
-            style="color: #8890b1"
+            style="color: #8890B1;"
           />
         </ws-select>
         <ws-input
@@ -25,23 +26,21 @@
           clearable
           maxlength="500"
           type="input"
-          class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button class="find" type="primary" @click="find()">
-          <img
+        <ws-button class="find" type="primary" @click="find()"
+          ><img
             width="16"
             height="16"
             style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -8px;
+              left: -5px;
             "
             src="../../../public/img/sousuo.png"
-            alt
-          />
-        </ws-button>
+            alt=""
+        /></ws-button>
+        <!-- </div> -->
       </template>
     </BaseHeaderLayout>
     <el-table
@@ -67,8 +66,26 @@
       <el-table-column class="table_td" prop="alreadyInvoice" label="已开发票(元)"></el-table-column>
       <el-table-column class="table_td" prop="notInvoice" label="未开发票(元)"></el-table-column>
       <el-table-column prop="status" label="状态">
-      </el-table-column>
-      <el-table-column class="table_td" prop="updateDate" label="更新时间"></el-table-column>
+            <template slot-scope="scope">
+              <el-popover
+                placement="left"
+                :width="285"
+                trigger="click"
+                visible-arrow="false"
+                @show="history(scope.row)"
+              >
+                <template>
+                  <span slot="reference">
+                    <span v-if="scope.row.status == '待回款'" class="executory"></span>
+                    <span v-if="scope.row.status == '已成交'" class="inExecution"></span>
+                    <span v-if="scope.row.status == '已回款'" class="done"></span>
+                    {{ scope.row.status }}
+                  </span>
+                </template>
+              </el-popover>
+            </template>
+          </el-table-column>
+      <el-table-column class="table_td" prop="updateDate" label="更新时间" width="130"></el-table-column>
       <el-table-column prop="seller" label="操作" width="200">
         <template slot-scope="scope">
           <div class="record" @click="dianlog(scope.row)">派发</div>
@@ -109,7 +126,7 @@
           </div> 
         <el-table :data="freightspace" style="width: 100%" height="560">
           <el-table-column prop="tranCarNo" label="编号" width="180"></el-table-column>
-          <el-table-column prop="carNo" label="车牌号" width="180">
+          <el-table-column prop="carNo" label="车牌号" width="180" maxlength="7">
             <template slot-scope="scope">
               <el-input
                 :disabled="scope.$index != 0"
@@ -496,55 +513,54 @@ export default {
     //   }
     // },
     add1(item) {
-      // if (!this.freightspace[0].carNo) {
-      //   this.$message({
-      //      message: '车牌号不能为空',
-        //      type: 'warning'
-      //   })
-      //   return
-      // }
-      // if (this.freightspace.carNo.length <= 7) {
-      //   this.$message({
-      //     message: '车牌号输入有误',
-      //     type: 'warning'
-      //   })
-      //   return
-      // }
-      // if (
-      //   !this.freightspace.boxNo.length < 1 ||
-      //   this.freightspace.boxNo.length > 15
-      // ) {
-      //   this.$message({
-      //     message: '箱号输入错误',
-      //     type: 'warning'
-      //   })
-      //   return
-      // }
-      // if (!this.freightspace[0].boxNo) {
-      //   this.$message({
-      //     message: '箱号不能为空',
-      //     type: 'warning'
-      //   })
-      //   return
-      // }
-      // if (
-      //   this.freightspace.titleNo.length < 1 ||
-      //   this.freightspace.titleNo.length > 15
-      // ) {
-      //   this.$message({
-      //     message: '封号输入错误',
-      //     type: 'warning'
-      //   })
-      //   return
-      // }
-      // if (!this.freightspace[0].titleNo) {
-      //   this.$message({
-      //     message: '封号不能为空',
-      //     type: 'warning'
-      //   })
-      //   return
-      // }
-
+          if (!this.freightspace.carNo) {
+        this.$message({
+           message: '车牌号不能为空',
+             type: 'warning'
+        })
+        return
+      }
+      if (this.freightspace.carNo.length <= 7) {
+        this.$message({
+          message: '车牌号输入有误',
+          type: 'warning'
+        })
+        return
+      }
+      if (
+        !this.freightspace.boxNo.length < 1 ||
+        this.freightspace.boxNo.length > 15
+      ) {
+        this.$message({
+          message: '箱号输入错误',
+          type: 'warning'
+        })
+        return
+      }
+      if (!this.freightspace.boxNo) {
+        this.$message({
+          message: '箱号不能为空',
+          type: 'warning'
+        })
+        return
+      }
+      if (
+        this.freightspace.titleNo.length < 1 ||
+        this.freightspace.titleNo.length > 15
+      ) {
+        this.$message({
+          message: '封号输入错误',
+          type: 'warning'
+        })
+        return
+      }
+      if (!this.freightspace.titleNo) {
+        this.$message({
+          message: '封号不能为空',
+          type: 'warning'
+        })
+        return
+      }
       console.log(this.planId)
       var tmp = this.freightspace[0].agent
       var tmp1 = this.freightspace.length + 1

src/views/purchasingManagement/purchaseOrderList.vue

@@ -1,37 +1,31 @@
 //采购订单
 <template>
-  <div class="container">
-<BaseHeaderLayout :leftSpan="10">
-      <template slot="left">
-         <span style="width: 70px; display: inline-block; color: #8890b1"
-          >状态：</span
-        >
+  <div>
+   <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
+          placeholder=""
           class="typeselect"
           @change="selecttaskType"
           :value="searchType"
         >
-        <ws-option
-          v-for="item in taskTypeList"
-          :key="item.value"
-          :label="item.value"
-          :value="item.value"
-          style="color:#8890b1"
-        />
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890B1;"
+          />
         </ws-select>
-      </template>
-      <!-- 接单开始 -->
-      <template slot="right">
-      
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按采购计划编号和标题查找"
+          placeholder="可按合同编号或客户查找"
           clearable
           maxlength="500"
           type="input"
-          class="findValue"
         ></ws-input>
         <ws-button class="find" type="primary" @click="find()"
           ><img
@@ -41,11 +35,12 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -8px;
+              left: -5px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
         /></ws-button>
+        <!-- </div> -->
       </template>
     </BaseHeaderLayout>
         <el-table
@@ -58,8 +53,8 @@
           height="700"
         >
           <el-table-column type="index" label="序号" width="50"></el-table-column>
-          <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
-          <el-table-column class="table_td" prop="procurementPlan" label="采购计划"></el-table-column>
+          <el-table-column class="table_td" prop="contractNo" label="合同编号" width="100"></el-table-column>
+          <el-table-column class="table_td" prop="procurementPlan" label="采购计划" width="125"></el-table-column>
           <el-table-column class="table_td" prop="customer" label="客户">
             <template slot-scope="scope">
               <div class="record" @click="customer(scope.row)">{{scope.row.customer}}</div>
@@ -84,23 +79,23 @@
             @click="editbasis(scope.row)"
             alt=""
           />
-<span v-if='!scope.row.basis'>-</span>
+        <span v-if='!scope.row.basis'>-</span>
             </template>
           </el-table-column>
-          <el-table-column class="table_td" prop="freezingDeposit" label="冻结定金(元)" width="100px"></el-table-column>
-          <el-table-column class="table_td" prop="defaultDeposit" label="拖欠定金(元)" width="100px"></el-table-column>
+          <el-table-column class="table_td" prop="freezingDeposit" label="冻结定金(元)" width="90"></el-table-column>
+          <el-table-column class="table_td" prop="defaultDeposit" label="拖欠定金(元)" width="100"></el-table-column>
           <el-table-column  width="100" class="table_td" prop="unloadingCharge" label="卸车费(元/吨)"></el-table-column>
           <el-table-column  width="100" class="table_td" prop="invoiceFee" label="发票费(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="transactionsNumber" label="合同重量(吨)" width="100px"></el-table-column>
-          <el-table-column class="table_td" prop="stockInQuantity" label="已入库量(吨)" width="90px"></el-table-column>
-          <el-table-column class="table_td" prop="openPosition" label="可平仓量(吨)" width="90px" ></el-table-column>
-          <el-table-column class="table_td" prop="closedPosition" label="已平仓量(吨)" width="90px">
+          <el-table-column class="table_td" prop="transactionsNumber" label="合同重量(吨)" width="100"></el-table-column>
+          <el-table-column class="table_td" prop="stockInQuantity" label="已入库量(吨)" width="90"></el-table-column>
+          <el-table-column class="table_td" prop="openPosition" label="可平仓量(吨)" width="90" ></el-table-column>
+          <el-table-column class="table_td" prop="closedPosition" label="已平仓量(吨)" width="90">
             <template slot-scope="scope">
               {{scope.row.closedPosition}}
               <i @click="closedPosition(scope.row)" class="iconfont icon-lishi"></i>
             </template>
           </el-table-column>
-          <el-table-column class="table_td" prop="cumulativeTurnover" label="已成交量(吨)" width="90px">
+          <el-table-column class="table_td" prop="cumulativeTurnover" label="已成交量(吨)" width="90">
             <template slot-scope="scope">
               {{scope.row.cumulativeTurnover}}
               <i @click="transactionRecord(scope.row)" class="iconfont icon-lishi"></i>
@@ -120,7 +115,7 @@
                 <template>
                   <span slot="reference">
                     <span v-if="scope.row.status == '待审核'" class="executory"></span>
-                    <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+                    <span v-if="scope.row.status == '已成交'" class="inExecution"></span>
                     <span v-if="scope.row.status == '已完成'" class="done"></span>
                     {{ scope.row.status }}
                   </span>
@@ -128,21 +123,21 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column class="table_td" label="更新时间" prop="updateDate"></el-table-column>
-          <el-table-column class="table_td" label="入库结算" prop="updateDate"></el-table-column>
-          <el-table-column class="table_td" label="平仓结算" prop="updateDate"></el-table-column>
-          <el-table-column prop="seller" label="操作" width="320">
+          <el-table-column class="table_td" label="更新时间" prop="updateDate" width="130"></el-table-column>
+          <el-table-column class="table_td" label="入库结算" prop="updateDate" width="130"></el-table-column>
+          <el-table-column class="table_td" label="平仓结算" prop="updateDate" width="130"></el-table-column>
+          <el-table-column prop="seller" label="操作" width="310">
             <template slot-scope="scope">
-              <el-button v-if='scope.row.status=="已通过"||scope.row.status=="已成交"' class="record" @click="makeabargain(scope.row)">成交</el-button>
+              <div v-if='scope.row.status=="已通过"||scope.row.status=="已成交"' class="record" @click="makeabargain(scope.row)">成交</div>
               <!-- 补充定金 -->
-              <el-button v-if='scope.row.defaultDeposit>0' class="record" @click="addthedeposit(scope.row)">补充定金</el-button>
-              <el-button v-if='scope.row.freezingDeposit>0' class="record" @click='unfreeze(scope.row)'>解冻定金</el-button>
+              <div v-if='scope.row.defaultDeposit>0' class="record" @click="addthedeposit(scope.row)">补充定金</div>
+              <div v-if='scope.row.freezingDeposit>0' class="record" @click='unfreeze(scope.row)'>解冻定金</div>
               <!-- 平仓 -->
-              <el-button  v-if='scope.row.openPosition>0' class="record" @click="cloaeposition1(scope.row)">平仓</el-button>
-              <el-button v-if='scope.row.status=="已通过"||scope.row.status=="已成交"'  class="record" @click="handle(scope.row)">完成</el-button>
+              <div  v-if='scope.row.openPosition>0' class="record" @click="cloaeposition1(scope.row)">平仓</div>
+              <div v-if='scope.row.status=="已通过"||scope.row.status=="已成交"'  class="record" @click="handle(scope.row)">完成</div>
               <!-- 审核 -->
-              <el-button v-if='scope.row.status=="待审核"' type="text" class="record" @click="aduit(scope.row)">审核</el-button>
-              <el-button v-if='scope.row.status=="待审核"' class="record" @click="deletehandle(scope.row)">删除</el-button>
+              <div v-if='scope.row.status=="待审核"' type="text" class="record" @click="aduit(scope.row)">审核</div>
+              <div v-if='scope.row.status=="待审核"' class="record" @click="deletehandle(scope.row)">删除</div>
             </template>
           </el-table-column>
         </el-table>
@@ -210,14 +205,14 @@
                   <el-button type="primary" @click=" chengjiao()">确 定</el-button>
                 </div>
               </el-dialog>
-         <el-dialog
-                width="40%"
+              <el-dialog
+                width="20%"
                 title="补充定金"
                 :visible.sync="dialogFormVisible3"
                 :append-to-body="true"
               >
                 <el-form :model="form">
-                  <h5>{{replenishlist.customer}}</h5>
+                  <h5 style=" margin-left:30px;">{{replenishlist.customer}}</h5>
                   <el-form-item label="拖欠定金" :label-width="formLabelWidth">
                     {{replenishlist.defaultDeposit}}
                   </el-form-item>
@@ -239,7 +234,7 @@
                 </div>
               </el-dialog>
           <el-dialog
-                width="40%"
+                width="25%"
                 title="平仓"
                 :visible.sync="dialogFormVisible2"
                 :append-to-body="true"
@@ -247,10 +242,10 @@
                 <el-form class='closeposition'>
                   <el-form-item label="成交价格（元/吨）" prop="transactionPrice" >
                     <ws-select
-              v-model="closePositionList1.transactionPrice"
-              placeholder
-              class="deal"
-              placeholder="请输入成交价"
+                      v-model="closePositionList1.transactionPrice"
+                      placeholder
+                      class="deal"
+                      placeholder="请输入成交价"
             >
               <ws-option
                 v-for="item in transactionRecordList"
@@ -297,11 +292,11 @@
                   </el-form-item>
                   <el-form-item label="平仓日期" prop="closePositionDate"  >
                     <el-date-picker
-      v-model="closePositionList1.closePositionDate"
-      type="date"
-      placeholder="选择日期"
-      format="yyyy 年 MM 月 dd 日"
-      value-format="yyyy-MM-dd"/>
+                      v-model="closePositionList1.closePositionDate"
+                      type="date"
+                      placeholder="选择日期"
+                      format="yyyy 年 MM 月 dd 日"
+                      value-format="yyyy-MM-dd"/>
                   </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
@@ -311,7 +306,7 @@
               </el-dialog>
 
         <el-dialog
-                width="40%"
+                width="30%"
                 title="审核"
                 :visible.sync="dialogFormVisible4"
                 :append-to-body="true"
@@ -420,7 +415,7 @@
                   <el-button type="primary" @click="aduitconfirm">通过</el-button>
                 </div>
               </el-dialog>
-       <el-dialog
+              <el-dialog
               width="30%"
               title="客户信息"
               :visible.sync="dialogFormVisible8"
@@ -481,13 +476,14 @@
                 <el-button @click="dialogFormVisible8 = false">取 消</el-button>
               </div>
             </el-dialog>
- <el-dialog
+            <el-dialog
               width="40%"
               title="成交记录"
               :visible.sync="dialogFormVisible6"
               :append-to-body="true"
+              
             >
-              <el-table :data="transactionRecordList">
+              <el-table :data="transactionRecordList"  >
                 <el-table-column  prop="transactionPrice" label="成交价">
                 </el-table-column>
                 <el-table-column  prop="basis" label="基差" >
@@ -520,14 +516,14 @@
               </el-table>
             </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.updateDate}}</div>
+              <div >{{item.priceType}}{{item.price}}</div>
+              <div >{{item.updateDate}}</div>
             </div>
             
             </el-dialog>
@@ -1191,7 +1187,6 @@ dialogImageUrl:"",
 }
 </script>
 <style lang="scss" scoped>
-// @import '../../../../static/iconfont/iconfont.css';
 .connert {
   width: 90%;
   margin: 0 auto;
@@ -1232,6 +1227,7 @@ dialogImageUrl:"",
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
   width: 385px;
+ margin-left: 53.5%;
 }
 .completed.el-button--default {
   border-color: #5878e8;
@@ -1259,6 +1255,7 @@ dialogImageUrl:"",
   color: #5878e8;
   padding: 0 4px !important;
   position: relative;
+  font-size: 14px;
 }
 .record:after {
   position: absolute;
@@ -1268,11 +1265,8 @@ dialogImageUrl:"",
   right: -2px;
   width: 1px;
   height: 12px;
-  background: #e9ecf7;
+  // background: #e9ecf7;
 }
-// .el-row{
-//     height: 150px;
-// }
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
@@ -1304,14 +1298,6 @@ dialogImageUrl:"",
 .done {
   background: #50cad4;
 }
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
 .container {
   overflow: scroll;
   height: 93vh;
@@ -1400,7 +1386,7 @@ dialogImageUrl:"",
   overflow-y: hidden;
 }
 .deal {
-  width: 66%;
+  width: 100%;
 }
 .photo {
   padding: 0% 34%;
@@ -1430,7 +1416,7 @@ border-bottom:1px solid #ccc;
 }
 /deep/.base_header_layout .grid-content {
     border-radius: 4px;
-    height: 54px;
+    height: 36px;
     line-height: 30px;
     display: -webkit-box;
     display: -ms-flexbox;
@@ -1441,18 +1427,38 @@ border-bottom:1px solid #ccc;
     text-align: justify;
     margin: 0 auto;
 }
-/deep/.findValue .el-input__inner {
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
-    width: 385px;
-    margin-left: 58%;
-}
 /deep/.base_header_layout .grid-content.right .find.el-button--primary {
     width: 30px;
     margin-left: 0;
     border-top-left-radius: 0px;
     border-bottom-left-radius: 0px;
     margin-top: -3px;
-    margin-left: -10px;
+    // margin-left: -10px;
+}
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
+}
+.chenglu {
+  font-size: 14px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #8890B1;
+  line-height: 20px;
 }
+// .vertical-text {
+//   margin: 0 10px;
+//   color: #8890b1;
+//   font-size: 12px;
+//   margin-top: -4px;
+// }
+// .vertical-circle {
+//   width: 10px;
+//   height: 10px;
+//   border: 2px solid #5878e8;
+//   background-color: #ffffff;
+//   -webkit-border-radius: 100px;
+// }
+// .vertical-circle:first-child {
+//   color: red;
+// }
 </style>

src/views/salesManagement/salesPlanOrderList.vue

@@ -93,17 +93,19 @@
         class="table_td"
         prop="contractNo"
         label="合同编号"
+        width="100"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="salePlan"
         label="销售计划"
+        width="125"
       ></el-table-column>
       <el-table-column class="table_td" prop="customer" label="客户">
         <template slot-scope="scope">
-          <el-button class="record" @click="customer(scope.row)">{{
+          <div class="record" @click="customer(scope.row)">{{
             scope.row.customer
-          }}</el-button>
+          }}</div>
         </template>
       </el-table-column>
       <el-table-column
@@ -157,11 +159,13 @@
         class="table_td"
         prop="freezingDeposit"
         label="冻结定金(元)"
+        width="90"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="defaultDeposit"
         label="拖欠定金(元)"
+        width="100"
       ></el-table-column>
       <el-table-column
         width="100"
@@ -179,21 +183,25 @@
         class="table_td"
         prop="transactionsNumber"
         label="合同重量(吨)"
+        width="100"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="stockOutQuantity"
         label="已出库量(吨)"
+        width="90"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="openPosition"
         label="可平仓量(吨)"
+        width="90"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="closedPosition"
         label="已平仓量(吨)"
+        width="90"
       >
         <template slot-scope="scope">
           {{ scope.row.closedPosition }}
@@ -204,6 +212,7 @@
         class="table_td"
         prop="cumulativeTurnover"
         label="已成交量(吨)"
+        width="90"
       >
         <template slot-scope="scope">
           {{ scope.row.cumulativeTurnover }}
@@ -239,7 +248,7 @@
                   class="executory"
                 ></span>
                 <span
-                  v-if="scope.row.status == '执行中'"
+                  v-if="scope.row.status == '已成交'"
                   class="inExecution"
                 ></span>
                 <span v-if="scope.row.status == '已完成'" class="done"></span>
@@ -253,64 +262,67 @@
         class="table_td"
         label="更新时间"
         prop="updateDate"
+        width="130"
       ></el-table-column>
       <el-table-column
         class="table_td"
         label="入库结算"
         prop="updateDate"
+        width="130"
       ></el-table-column>
       <el-table-column
         class="table_td"
         label="平仓结算"
         prop="updateDate"
+        width="130"
       ></el-table-column>
       <el-table-column prop="seller" label="操作" width="360">
         <template slot-scope="scope">
-          <el-button
+          <div
             v-if="scope.row.status == '已通过' || scope.row.status == '已成交'"
             class="record"
             @click="makeabargain(scope.row)"
-            >成交</el-button
+            >成交</div
           >
           <!-- 补充定金 -->
-          <el-button
+          <div
             v-if="scope.row.defaultDeposit > 0"
             class="record"
             @click="addthedeposit(scope.row)"
-            >补充定金</el-button
+            >补充定金</div
           >
-          <el-button
+          <div
             v-if="scope.row.freezingDeposit > 0"
             class="record"
             @click="unfreeze(scope.row)"
-            >解冻定金</el-button
+            >解冻定金</div
           >
           <!-- 平仓 -->
-          <el-button
+          <div
             v-if="scope.row.openPosition > 0"
             class="record"
             @click="cloaeposition1(scope.row)"
-            >平仓</el-button
+            >平仓</div
           >
-          <el-button
+          <div
             v-if="scope.row.status == '已通过' || scope.row.status == '已成交'"
             class="record"
             @click="handle(scope.row)"
-            >完成</el-button
+            >完成</div
           >
           <!-- 审核 -->
-          <el-button
+          <div
             v-if="scope.row.status == '待审核'"
             type="text"
             class="record"
             @click="aduit(scope.row)"
-            >审核</el-button
+            >审核</div
           >
-          <el-button
+          <div
             v-if="scope.row.status == '待审核'"
             class="record"
             @click="deletehandle(scope.row)"
-            >删除</el-button
+            >删除</div
           >
         </template>
       </el-table-column>
@@ -1662,9 +1674,9 @@ hr {
 .customer .el-form-item {
   border-bottom: 1px solid #ccc;
 }
-// .danjia{
-//   width: 9px;
-//   height: 9px;
-//   margin-left: 40px;
-// }
+.base_header_layout {
+    padding: 10px 10px 0;
+    background-color: #fff;
+    height: 50px;
+}
 </style>

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