前端gjy

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -74,7 +74,7 @@
           />
         </ws-form-item>
         <!--买方电话-->
-        <ws-form-item label="买方电话" span="1" prop="contractNo">
+        <ws-form-item label="买方电话" span="1" prop="buyerPhone">
           <ws-input
             v-model.number="deptBudgetList.buyerPhone"
             placeholder="请输入买方电话"
@@ -1672,6 +1672,9 @@ export default {
   top: 21%;
   font-size: 20px;
 }
+.upload-demo{
+  margin-top: 10px;
+}
 .title {
   position: relative;
 }

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -741,6 +741,11 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
+          if (this.deptBudgetList.deliverType == 1) {
+            this.deptBudgetList.deliverType1 = '我方自提'
+          } else if (this.deptBudgetList.deliverType == 2) {
+            this.deptBudgetList.deliverType1 = '对方送货'
+          }
           this.selectedOptions = tmp
           var tmp = []
           tmp[0] = TextToCode[response.deliveryProvince].code
@@ -765,12 +770,6 @@ export default {
           tmp1[1] =
             TextToCode[response.contractGoodsInfo.outputPrivate][response.contractGoodsInfo.outputCity].code
           this.selectedOptions1 = tmp1
-          if (this.deptBudgetList.deliverType == 1) {
-            this.deptBudgetList.deliverType1 = '我方自提'
-          } else if (this.deptBudgetList.deliverType == 2) {
-            this.deptBudgetList.deliverType1 = '对方送货'
-          }
-
           if (this.deptBudgetList.addressUrl != null) {
             this.addressUrls = this.deptBudgetList.addressUrl.split(',')
             this.fileList = this.deptBudgetList.addressUrl.split(',')

src/views/contractManagement/futuresPurchaseContractExamine.vue

@@ -143,7 +143,7 @@
         <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
           {{ deptBudgetList.deliveryDateStart }}
         </ws-form-item>
-        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge">
+        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType == 1">
           {{ deptBudgetList.personCharge }}
         </ws-form-item>
         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -1640,6 +1640,9 @@ export default {
 .readonly {
   position: relative;
 }
+.upload-demo{
+  margin-top: 10px;
+}
 .readonly:after {
   content: '*';
   color: #ff2727;

src/views/contractManagement/purchaseContractAdd.vue

@@ -1655,6 +1655,9 @@ export default {
 .wenzi p {
   display: inline-block;
 }
+.upload-demo{
+  margin-top: 10px;
+}
 .center {
   width: 70%;
   margin: 0 auto;

src/views/contractManagement/purchaseContractEdit.vue

@@ -309,7 +309,7 @@
           label="临时仓库负责人"
           span="1"
           prop="packingMethod"
-          v-show="deptBudgetList.deliverType == 1"
+          v-if="deptBudgetList.deliverType == 1"
         >
           <el-select
             v-model="deptBudgetList.personCharge"

src/views/contractManagement/purchaseContractExamine.vue

@@ -140,7 +140,7 @@
         <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
           {{ deptBudgetList.finalTradingVolume }}
         </ws-form-item>
-        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge">
+        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType == 1">
           {{ deptBudgetList.personCharge }}
         </ws-form-item>
       </ws-info-table>

src/views/contractManagement/salesContractAdd.vue

@@ -1498,6 +1498,9 @@ export default {
   background-color: #5878e8;
   border-color: #5878e8;
 }
+.upload-demo{
+  margin-top: 10px;
+}
 .el-col {
   background: #f6f7fc;
 }

src/views/platformaudit/driverreview.vue

@@ -60,7 +60,7 @@
                 <ws-info-table>
                   <ws-form-item
                     :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 1"
+                    v-if="item.accountTypeFlag =='1'"
                     label="收款人"
                     span="1"
                     prop="payeeName"
@@ -70,7 +70,7 @@
                   </ws-form-item>
                   <ws-form-item
                     :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 2"
+                    v-else
                     label="企业名称"
                     span="1"
                     prop="compName"
@@ -80,7 +80,7 @@
                   </ws-form-item>
                   <ws-form-item
                     :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 1"
+                    v-if="item.accountTypeFlag == '1'"
                     label="身份证"
                     span="1"
                     prop="payeeNumberCard"
@@ -88,13 +88,6 @@
                   >
                     <div style="width: 100%">
                       {{ item.payeeNumberCard }}
-                      <img
-                        width="12"
-                        height="13"
-                        src="../../../public/img/fujian-grey.png"
-                        alt=""
-                        @click="fujian1(item)"
-                      />
                     </div>
                   </ws-form-item>
                   <ws-form-item
@@ -131,6 +124,13 @@
                     prop="bankCard"
                     class="el-car"
                   >
+                   <img
+                        width="12"
+                        height="13"
+                        src="../../../public/img/fujian-grey.png"
+                        alt=""
+                        @click="fujian1(item)"
+                      />
                     <div style="width: 100%">{{ item.bankCard }}</div>
                   </ws-form-item>
                 </ws-info-table>
@@ -539,6 +539,8 @@ export default {
             response.records[i].carNumber =''
             response.records[i].carModel =''
             response.records[i].carLength =''
+             response.records[i].carLoad =''
+              response.records[i].yearManufacture =''
             response.records[i].expandsStatus = false
             if (response.records[i].addressUrl != null) {
               response.records[i].addressUrlArray =
@@ -554,6 +556,10 @@ export default {
               response.records[i].driverCarInfoList[0].carModel
               response.records[i].carLength =
               response.records[i].driverCarInfoList[0].carLength
+              response.records[i].carLoad =
+              response.records[i].driverCarInfoList[0].carLoad
+              response.records[i].yearManufacture =
+              response.records[i].driverCarInfoList[0].yearManufacture
             }
           }
             

src/views/platformaudit/grainmerchantreview.vue

@@ -93,13 +93,6 @@
                 >
                   <div style="width: 100%">
                     {{ props.row.payeeNumberCard }}
-                    <img
-                      width="12"
-                      height="13"
-                      src="../../../public/img/fujian-grey.png"
-                      alt=""
-                      @click="fujian1(props.row)"
-                    />
                   </div>
                 </ws-form-item>
                 <ws-form-item
@@ -574,17 +567,6 @@ export default {
       this.accessoryimages.payeeAddressUrl1=row.payeeAddressUrl.split(',')[1]
       this.accessoryTFs=true
     },
-    fujian1(item) {
-      if (item.cardAddressUrl === null || item.cardAddressUrl === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accesscard = true
-      }
-      this.accessurl = item.cardAddressUrl
-    },
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',

src/views/platformaudit/saletransactioninformationreview.vue

@@ -20,7 +20,7 @@
         </ws-select>
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按编号、发布企业和发布方查找"
+          placeholder="可按编号、发布方和货名查找"
           clearable
           maxlength="500"
           type="input"
@@ -293,6 +293,7 @@ export default {
           this.searchType = this.searchTypeList[i].type
         }
       }
+      this.currentPage= 1
       this.getList()
     },
     //审核通过

src/views/platformaudit/transactioninformationreview.vue

@@ -20,7 +20,7 @@
         </ws-select>
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按编号、发布企业和发布方查找"
+          placeholder="可按编号、发布方和货名查找"
           clearable
           maxlength="500"
           type="input"
@@ -293,6 +293,7 @@ export default {
           this.searchType = this.searchTypeList[i].type
         }
       }
+      this.currentPage= 1
       this.getList()
     },
     //审核通过

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -734,7 +734,7 @@ export default {
         })
         return
       }
-      if (this.dataList.buyerPhone.length!=11) {
+      if (this.dataList.buyerPhone.length > 15 || this.dataList.buyerPhone.length < 6) {
         this.$message({
           message: '买方电话输入错误!',
           type: 'warning'
@@ -867,7 +867,7 @@ export default {
               // this.dataList.goodsType = 1
               this.dataList.pcFlag = 1
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
-              console.log(this.dataList,"查看添加对象")
+              console.log(this.dataList,'查看添加对象')
               procurementAdd(this.dataList)
                 .toPromise()
                 .then(response => {

src/views/purchasingManagement/procurementPlanList.vue

@@ -12,7 +12,7 @@
       <template slot="right">
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按采购计划编号和标题查找"
+          placeholder="可按采购计划编号、标题和货名查找"
           clearable
           maxlength="500"
           type="input"

src/views/purchasingManagement/purchaseOrderList.vue

@@ -667,7 +667,7 @@
             class="deal"
           ></el-input>
         </el-form-item>
-        <el-form-item label="发票费用(元/吨)" :label-width="formLabelWidth">
+        <el-form-item v-if='aduitlist.procurementPlanType=="期货"' label="发票费用(元/吨)" :label-width="formLabelWidth">
           <el-input
             v-model="aduitlist.invoiceFee"
             autocomplete="off"
@@ -1023,6 +1023,21 @@ export default {
           return
         }
       }
+      if (
+        (row.basis&&
+          String(row.basis).indexOf('.') != -1 &&
+          String(row.basis).length -
+            (String(row.basis).indexOf('.') + 1) >
+            2) ||
+        row.basis > 100000 ||
+        row.basis < 0
+      ) {
+        this.$message({
+          message: '基差输入错误',
+          type: 'warning',
+        })
+        return
+      }
       if (!row.basis) {
         this.$message({
           message: '基差不能为空！',
@@ -1038,7 +1053,7 @@ export default {
         .then(() => {
           editStatus({
             flag: 3,
-            basis: row.basis,
+            basis: '-'+row.basis,
             id: row.id,
           })
             .toPromise()
@@ -1426,6 +1441,9 @@ export default {
       this.aduitlist.procurementPlanType = this.aduitlist.procurementPlanType
        if (this.aduitlist.procurementPlanType == '期货') {
            this.aduitlist.freezingDeposit = this.aduitlist.transactionsNumber*this.aduitlist.depositRatio
+           if(this.aduitlist.invoiceFee){
+             this.aduitlist.invoiceFee=-Math.abs(this.aduitlist.invoiceFee)
+           }
        }
       this.dialogFormVisible4 = false
       this.$confirm(`审核通过后，将通知客户订单生效，是否确定通过审核？`, {

src/views/salesManagement/salesPlanAdd.vue

@@ -834,7 +834,7 @@ export default {
         })
         return
       }
-      if (this.dataList.sellerPhone.length != 11) {
+      if (this.dataList.sellerPhone.length > 15 || this.dataList.sellerPhone.length < 6) {
         this.$message({
           message: '卖方电话输入错误!',
           type: 'warning',

src/views/salesManagement/salesPlanList.vue

@@ -9,7 +9,7 @@
       <template slot="right">
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按销售计划编号和标题查找"
+          placeholder="可按采购计划编号、标题和货名查找"
           clearable
           maxlength="500"
           type="input"

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -34,7 +34,13 @@
           " @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>
+        <ws-button type="primary" v-hasPermission="
+            `report.procurementInReport.view`
+          " @click="handlereject(3)">驳回</ws-button>
         </el-col>
         <el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="8">
         <ws-select
@@ -65,10 +71,14 @@
       </el-col>
       </el-row>
       <div v-if='contractNo!=""'>
-      <span>合同重量:{{orderList.transactionsNumber}}吨</span>
-      <span>成交量:{{orderList.cumulativeTurnover}}吨</span>
-      <span>已平仓:{{orderList.closedPosition}}吨</span>
-      <span>入库量:{{orderList.stockInQuantity}}吨</span>
+        <span v-if='orderList.transactionsNumber'>合同重量: {{orderList.transactionsNumber}} 吨</span>
+        <span v-else>合同重量: 0 吨</span>
+        <span v-if='orderList.cumulativeTurnover'>成交量: {{orderList.cumulativeTurnover}} 吨</span>
+        <span v-else>成交量: 0 吨</span>
+        <span v-if='orderList.closedPosition'>已平仓: {{orderList.closedPosition}} 吨</span>
+        <span v-else>已平仓: 0 吨</span>
+        <span v-if='orderList.stockInQuantity'>入库量: {{orderList.stockInQuantity}} 吨</span>
+        <span v-else>入库量: 0 吨</span>
       </div>
       
       <el-table
@@ -1052,7 +1062,9 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          this.orderList = response
+          if(response!=null){
+            this.orderList = response
+          }
         })
       this.getList()
     },

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -66,10 +66,14 @@
         </el-col>
       </el-row>
         <div v-if='contractNo!=""'>
-        <span>合同重量:{{orderList.transactionsNumber}}吨</span>
-        <span>成交量:{{orderList.cumulativeTurnover}}吨</span>
-        <span>已平仓:{{orderList.closedPosition}}吨</span>
-        <span>出库量:{{orderList.stockOutQuantity}}吨</span>
+        <span v-if='orderList.transactionsNumber'>合同重量: {{orderList.transactionsNumber}} 吨</span>
+        <span v-else>合同重量: 0 吨</span>
+        <span v-if='orderList.cumulativeTurnover'>成交量: {{orderList.cumulativeTurnover}} 吨</span>
+        <span v-else>成交量: 0 吨</span>
+        <span v-if='orderList.closedPosition'>已平仓: {{orderList.closedPosition}} 吨</span>
+        <span v-else>已平仓: 0 吨</span>
+        <span v-if='orderList.stockOutQuantity'>出库量: {{orderList.stockOutQuantity}} 吨</span>
+        <span v-else>出库量: 0 吨</span>
         </div>
         
         <el-table
@@ -574,7 +578,9 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          this.orderList = response
+          if(response!=null){
+            this.orderList = response
+          }
         })
       this.getList()
     },

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.110: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/',