Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/api/V2/purchasingManagement/index.js

@@ -16,6 +16,8 @@ export const API_POST_PROCUREMENT_EDIT = '/procurementPlanInfo/api/editProcureme
 export const API_POST_PROCUREMENT_DELETE = '/procurementPlanInfo/api/deleteProcurementPlan'
 // 采购订单审核
 export const API_POST_ADUIT_PURCHASE = '/purchaseOrder/api/editPurchaseOrder'
+// 采购订单平仓查看成交价
+export const API_GET_PRICE_PURCHASE = '/transactionRecord/getPriceList'
 // 采购订单合同
 export const API_GET_ADUIT_CONTRACTNO = '/warehouseBaseInfo/selectContractNoList'
 // 采购订单flag0 补充定金 1解冻定金 2完成 3更改基差

src/api/V2/salesManagement/index.js

@@ -23,4 +23,6 @@ export const API_GET_ADUIT_CONTRACTNO = '/warehouseBaseInfo/selectContractNoList
 //销售订单flag0 补充定金 1解冻定金 2完成 3更改基差
 export const API_POST_EDITSTATUS = '/saleOrder/api/editStatus'
 //销售订单删除
-export const API_POST_DELETESALE = '/saleOrder/api/deleteSaleOrder'
+export const API_POST_DELETESALE = '/saleOrder/api/deleteSaleOrder'
+//成交价列表
+export const API_GET_GETPRICELIST = '/transactionRecord/getPriceList'

src/api/V2/statisticalReport/index.js

@@ -22,6 +22,8 @@ export const API_POST_EDITSTATUS = '/purchaseOrder/api/editStatus'
 export const API_POST_PROCUREMENT_EDITSTATUS = '/procurementPlanInfo/api/editStatus'
 // 采购订单删除
 export const API_POST_DELETEPURCHASE = '/purchaseOrder/api/deletePurchaseOrder'
+// 采购入库报表头部信息
+export const API_GET_SELECTORDER= '/purchaseReceiptReport/selectOrder'
 // 销售平仓审核、通过、驳回
 export const API_POST_SALE_EXAMINE ='/salesClosingReport/api/examine'
 // 销售平仓列表
@@ -54,3 +56,5 @@ export const API_POST_SALES_BATCH_INVOICING = '/salesDeliveryReport/api/openInvo
 export const API_POST_FINAL_SETTLEMENT_PRICE = '/salesDeliveryReport/api/editSalesDeliveryReport'
 // 销售出库审核
 export const API_POST_ISSUE_APPROVAL = '/salesDeliveryReport/api/examineSalesDeliveryReport'
+// 销售出库报表头部信息
+export const API_GET_SELECTSALEORDER= '/salesDeliveryReport/selectOrder'

src/model/purchasingManagement/index.js

@@ -13,7 +13,8 @@ import {
     API_GET_ADUIT_CONTRACTNO,
     API_POST_EDITSTATUS,
     API_POST_PROCUREMENT_EDITSTATUS,
-    API_POST_DELETEPURCHASE
+    API_POST_DELETEPURCHASE,
+    API_GET_PRICE_PURCHASE
 } from '@/api/V2/purchasingManagement'
 // import { API_GET_PROCUREMENT_LOOK } from '../../api/V2/purchasingManagement'
 //采购详情列表
@@ -42,3 +43,5 @@ export const editStatus = appRx.post(API_POST_EDITSTATUS, errorCatcher,errorHand
 export const procurementEditOther = appRx.post(API_POST_PROCUREMENT_EDITSTATUS, errorCatcher,errorHandle,filter)
 //采购订单删除
 export const deletepurchase = appRx.post(API_POST_DELETEPURCHASE, errorCatcher,errorHandle,filter)
+//采购订单平仓查看成交价
+export const getTransactionPriceList = appRx.get(API_GET_PRICE_PURCHASE, errorCatcher,errorHandle,filter)

src/model/salesManagement/index.js

@@ -14,6 +14,7 @@ import {
     API_POST_SALEPLAN_EDIT,
     API_POST_SALEPLAN_DELETE,
     API_POST_SALEPLAN_EDITSTATUS,
+    API_GET_GETPRICELIST,
 } from '@/api/V2/salesManagement'
 // import { API_GET_PROCUREMENT_LOOK } from '../../api/V2/purchasingManagement'
 //销售订单列表
@@ -42,3 +43,5 @@ export const aduitcontractno = appRx.get(API_GET_ADUIT_CONTRACTNO, errorCatcher,
 export const editStatus = appRx.post(API_POST_EDITSTATUS, errorCatcher,errorHandle,filter)
 //销售订单删除
 export const deletesale = appRx.post(API_POST_DELETESALE, errorCatcher,errorHandle,filter)
+//成交价列表
+export const getpricelist = appRx.get(API_GET_GETPRICELIST, errorCatcher,errorHandle,filter)

src/model/statisticalReport/index.js

@@ -25,7 +25,9 @@ import {
     API_POST_ISSUE_APPROVAL,
     API_GET_SALE_OUT_CONTRACTNO,
     API_GET_PURCHASE_CONTRACTNO,
-    API_GET_PURCHASE_IN_CONTRACTNO
+    API_GET_PURCHASE_IN_CONTRACTNO,
+    API_GET_SELECTORDER,
+    API_GET_SELECTSALEORDER
 
 } from '@/api/V2/statisticalReport'
 //采购入库报表
@@ -46,6 +48,8 @@ export const postreplanishent = appRx.post(API_POST_REPLANISHENT, errorCatcher,
 export const postaudit = appRx.post(API_POST_AUDIT, errorCatcher, errorHandle, filter)
 //采购入库付款
 export const postpaymoney = appRx.post(API_POST_PAYMONEY, errorCatcher, errorHandle, filter)
+//采购入库报表头部
+export const getorder = appRx.get(API_GET_SELECTORDER, errorCatcher, errorHandle, filter)
 //销售平仓审核
 export const postsaleaudit = appRx.post(API_POST_SALE_EXAMINE, errorCatcher, errorHandle, filter)
 //销售平仓列表
@@ -81,5 +85,7 @@ export const salesbatchinvoicing = appRx.post(API_POST_SALES_BATCH_INVOICING, er
 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)
+//销售出库报表头部
+export const getsaleorder = appRx.get(API_GET_SELECTSALEORDER, errorCatcher, errorHandle, filter)
 
 

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -23,10 +23,11 @@
           <h3>基本信息</h3>
         </div>
          <el-form ref="dataList" :model="dataList" label-width="140px">
-          <ws-form-item label="标题" span="1" prop="title">
+          <ws-form-item label="标题" span="1" prop="title" >
             <el-input v-model="dataList.title" maxlength="16" placeholder="请输入标题，不超过16个字" />
+              <span class="unchangeable">*</span>
           </ws-form-item>
-          <ws-form-item label="货名" span="1" prop="goodsName">
+          <ws-form-item label="货名" span="1" prop="goodsName" >
             <ws-select
               v-model="dataList.goodsName"
               placeholder
@@ -40,18 +41,21 @@
                 :value="item.constValue"
               />
             </ws-select>
+            <span class="unchangeable">*</span>
           </ws-form-item>
-          <ws-form-item label="计划采购量（吨）" span="1" prop="plannedPurchaseVolume">
+          <ws-form-item label="计划采购量（吨）" span="1" prop="plannedPurchaseVolume" >
             <el-input
               v-model="dataList.plannedPurchaseVolume"
               class="typeselect"
               placeholder="请输入计划采购量"
             />
+            <span class="unchangeable">*</span>
           </ws-form-item>
-          <ws-form-item label="最小成交量（吨）" span="1" prop="minimumVolume">
+          <ws-form-item label="最小成交量（吨）" span="1" prop="minimumVolume" >
             <el-input v-model="dataList.minimumVolume" placeholder="请输入最小成交量" />
+            <span class="unchangeable">*</span>
           </ws-form-item>
-          <ws-form-item label="类型" span="1" prop="procurementPlanType">
+          <ws-form-item label="类型" span="1" prop="procurementPlanType" >
             <ws-select
               v-model="dataList.procurementPlanType"
               placeholder
@@ -65,6 +69,7 @@
                 :value="item.constValue"
               />
             </ws-select>
+            <span class="unchangeable">*</span>
           </ws-form-item>
          <ws-form-item label="价格类型" span="1" prop="priceType">
             <el-input v-model="dataList.priceType" disabled />
@@ -76,6 +81,7 @@
             prop="basisPrice"
           >
             <el-input v-model="dataList.basisPrice" placeholder="请输入基差" />
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item
             v-show="dataList.procurementPlanType=='现货'"
@@ -89,8 +95,9 @@
               size="small"
               placeholder="请输入采购价格"
             />
+            <span class="unchangeable">*</span>
           </ws-form-item>
-          <ws-form-item label="收货库" span="1" prop="receiveWarehouse">
+          <ws-form-item label="收货库" span="1" prop="receiveWarehouse" >
             <ws-select
               v-model="dataList.receiveWarehouse"
               placeholder
@@ -104,8 +111,9 @@
               :value="item.warehouseName"
               />
             </ws-select>
+            <span class="unchangeable">*</span>
           </ws-form-item>
-          <ws-form-item label="收货库所在地区" span="1" prop="receiveArea">
+          <ws-form-item label="收货库所在地区" span="1" prop="receiveArea" > 
             <el-cascader
               :options="options_"
               v-model="selectedOptions"
@@ -115,6 +123,7 @@
               @change="handleChange"
               style="width:200%"
             />
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item label="运费承担方" span="1" prop="freightPayer">
             <ws-select
@@ -131,7 +140,7 @@
               />
             </ws-select>
           </ws-form-item>
-          <ws-form-item label="包装方式" span="1" prop="packingType">
+          <ws-form-item label="包装方式" span="1" prop="packingType" > 
             <ws-select
               v-model="dataList.packingType"
               placeholder
@@ -145,6 +154,7 @@
                 :value="item.constValue"
               />
             </ws-select>
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <el-form-item v-if="dataList.packingType!='散装'" label="装袋备注" span="1" prop="baggingNotes">
             <el-input
@@ -154,10 +164,11 @@
               placeholder="请输入装袋要求如：98斤，王中王彩袋"
             />
           </el-form-item>
-          <ws-form-item label="买方" span="1" prop="buyer">
+          <ws-form-item label="买方" span="1" prop="buyer" >
             <el-input maxlength='25' v-model="dataList.buyer" size="small" placeholder="请输入买方名称" />
+            <span class="unchangeable">*</span>
           </ws-form-item>
-          <el-form-item label="买方电话" span="1" prop="buyerPhone">
+          <el-form-item label="买方电话" span="1" prop="buyerPhone" >
             <el-input
               v-model="dataList.buyerPhone"
               filterable
@@ -165,6 +176,7 @@
               :filter-method="dataFilter"
               placeholder="请输入买方电话"
             ></el-input>
+            <span class="unchangeable">*</span>
           </el-form-item>
           <div class="small-title"></div>
         </el-form>
@@ -174,11 +186,13 @@
           <h3>货物要求</h3>
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
-          <el-form-item label="水分(%)<=" span="1" prop="waterContent">
+          <el-form-item label="水分(%)<=" span="1" prop="waterContent" >
             <el-input v-model="dataList.waterContent" class="typeselect" placeholder="请输入水分占比" />
+            <span class="unchangeable">*</span>
           </el-form-item>
-          <el-form-item label="容重(g/l)<=" span="1" prop="bulkDensity">
+          <el-form-item label="容重(g/l)<=" span="1" prop="bulkDensity" >
             <el-input v-model="dataList.bulkDensity" class="typeselect" placeholder="请输入容重" />
+            <span class="unchangeable">*</span>
           </el-form-item>
           <el-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
             <el-input v-model="dataList.jiaorenli" class="typeselect" placeholder="请输入热损伤占比" />
@@ -642,7 +656,7 @@ export default {
       }
       if (!this.dataList.minimumVolume) {
         this.$message({
-          message: '最小交易量不能为空！',
+          message: '最小成交量不能为空！',
           type: 'warning'
         })
         return
@@ -650,18 +664,55 @@ export default {
       if (
         this.dataList.minimumVolume>10000000||this.dataList.minimumVolume<1) {
         this.$message({
-          message: '最小交易量输入错误！',
+          message: '最小成交量输入错误！',
           type: 'warning'
         })
         return
       }
       if (this.dataList.minimumVolume.indexOf('.') != -1 &&this.dataList.minimumVolume.split('.')[1].length >2) {
         this.$message({
-          message: '最小交易量输入错误！',
+          message: '最小成交量输入错误！',
           type: 'warning'
         })
         return
       }
+      if (
+        this.dataList.basisPrice&&String(this.dataList.basisPrice).indexOf('.') != -1 &&
+          String(dataList.basisPrice).length -
+            (String(this.dataList.basisPrice).indexOf('.') + 1) >
+            2||this.dataList.basisPrice>10000||this.dataList.basisPrice<1){
+        this.$message({
+          message: '基差输入错误',
+          type: 'warning'
+        })
+        return
+      }
+      if (
+        this.dataList.procurementPrice > 100000 ||
+        this.dataList.procurementPrice < 0 ||
+        (String(this.dataList.procurementPrice).indexOf(
+          '.'
+        ) != -1 &&
+          String(this.dataList.procurementPrice).length -
+            (String(this.dataList.procurementPrice).indexOf(
+              '.'
+            ) +
+              1) >
+            2)
+      ) {
+        this.$message({
+          message: '采购价格输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.dataList.receiveWarehouse) {
+        this.$message({
+          message: '请选择收货库',
+          type: 'warning',
+        })
+        return
+      }
       if (!this.dataList.buyer) {
         this.$message({
           message: '买方不能为空！',
@@ -714,6 +765,13 @@ export default {
         })
         return
       }
+      if (!this.dataList.bulkDensity) {
+        this.$message({
+          message: '容重不能为空！',
+          type: 'warning'
+        })
+        return
+      }
       if (
         this.dataList.bulkDensity&&String(this.dataList.bulkDensity).indexOf('.') != -1 &&
           String(this.dataList.bulkDensity).length -
@@ -729,7 +787,7 @@ export default {
         this.dataList.protein&&String(this.dataList.protein).indexOf('.') != -1 &&
           String(this.dataList.protein).length -
             (String(this.dataList.protein).indexOf('.') + 1) >
-            2||this.dataList.protein>40||this.dataList.protein<1){
+            2||this.dataList.protein>80||this.dataList.protein<1){
         this.$message({
           message: '蛋白占比输入错误',
           type: 'warning'
@@ -739,7 +797,8 @@ export default {
       if (
         this.dataList.impurity&&String(this.dataList.impurity).indexOf('.') != -1 &&
           String(this.dataList.impurity).length -
-            (String(this.dataList.impurity).indexOf('.') + 1) >2) {
+            (String(this.dataList.impurity).indexOf('.') + 1) >2
+            ||this.dataList.impurity>40||this.dataList.impurity<1) {
         this.$message({
           message: '杂质输入错误',
           type: 'warning'
@@ -750,7 +809,7 @@ export default {
         this.dataList.mildewGrain&&String(this.dataList.mildewGrain).indexOf('.') != -1 &&
           String(this.dataList.mildewGrain).length -
             (String(this.dataList.mildewGrain).indexOf('.') + 1) >
-            2) {
+            2||this.dataList.mildewGrain>40||this.dataList.mildewGrain<1) {
         this.$message({
           message: '霉变粒输入错误',
           type: 'warning'
@@ -761,7 +820,7 @@ export default {
         this.dataList.jiaorenli&&String(this.dataList.jiaorenli).indexOf('.') != -1 &&
           String(this.dataList.jiaorenli).length -
             (String(this.dataList.jiaorenli).indexOf('.') + 1) >
-            2) {
+            2||this.dataList.jiaorenli>40||this.dataList.jiaorenli<1) {
         this.$message({
           message: '热损伤输入错误',
           type: 'warning'
@@ -772,13 +831,14 @@ export default {
         this.dataList.imperfectGrain&&String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
           String(this.dataList.imperfectGrain).length -
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
-            2) {
+            2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1) {
         this.$message({
           message: '不完整粒输入错误',
           type: 'warning'
         })
         return
       }
+
       this.dataList.id = this.$route.query.id
       this.$confirm(`提交后该采购信息将发布到交易平台，是否确定提交？`, {
         cancelButtonText: '取消',
@@ -799,7 +859,7 @@ export default {
               this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
 
               this.dataList.compId = this.compId
-
+              this.dataList.unitPrice=this.dataList.procurementPrice
               
               // this.dataList.contractType = 1
               // this.dataList.goodsType = 1
@@ -823,22 +883,6 @@ export default {
           return false
         })
     },
-
-    selectwarehouseName() {},
-    tarechange(e) {
-      if (this.dataList.grossWeight && this.dataList.tare) {
-        this.dataList.netWeight = Number(
-          this.dataList.grossWeight - this.dataList.tare
-        )
-      }
-    },
-    grossWeightchange(e) {
-      if (this.dataList.grossWeight && this.dataList.tare) {
-        this.dataList.netWeight = Number(
-          this.dataList.grossWeight - this.dataList.tare
-        )
-      }
-    },
     selectgoodsName(e) {
       for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].constValue == e) {
@@ -1113,16 +1157,20 @@ export default {
   width: 400px;
   height: 20px;
 }
-.readonly :after {
-  content: '*';
-  color: #ff2727;
-  position: absolute;
-  right: 8px;
-  z-index: 10;
-  top: 21%;
-  font-size: 20px;
-}
 /deep/.typeselect .el-input__inner {
   color: #8890b1;
 }
+//*号
+.unchangeable {
+  position: absolute;
+  width: 9px;
+  height: 22px;
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #ff2727;
+  line-height: 22px;
+  display: inline-block;
+  right: -1px;
+}
 </style>

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -661,150 +661,208 @@ export default {
     submit() {
       if (!this.dataList.title) {
         this.$message({
-          message: '标题不能为空',
-          type: 'warning',
+          message: '标题不能为空！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.dataList.title.length>16) {
+        this.$message({
+          message: '标题输入错误！',
+          type: 'warning'
         })
         return
       }
       if (!this.dataList.plannedPurchaseVolume) {
         this.$message({
-          message: '计划采购量不能为空',
-          type: 'warning',
+          message: '计划采购量不能为空！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.dataList.plannedPurchaseVolume>10000000||this.dataList.plannedPurchaseVolume<1) {
+        this.$message({
+          message: '计划采购量输入错误！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.dataList.plannedPurchaseVolume.toString().indexOf('.')!=-1) {
+        if(this.dataList.plannedPurchaseVolume.toString().split('.')[1].length>2){
+          this.$message({
+            message: '计划采购量输入错误！',
+            type: 'warning'
+          })
+          return
+        }
+      }
+      if (!this.dataList.minimumVolume) {
+        this.$message({
+          message: '最小成交量不能为空！',
+          type: 'warning'
         })
         return
       }
       if (
-        !this.dataList.minimumVolume ||
-        (String(this.dataList.minimumVolume).indexOf('.') != -1 &&
-          String(this.dataList.minimumVolume).length -
-            (String(this.dataList.minimumVolume).indexOf('.') + 1) >
-            2)
-      ) {
+        this.dataList.minimumVolume>10000000||this.dataList.minimumVolume<1) {
         this.$message({
-          message: '最小交易量输入错误',
-          type: 'warning',
+          message: '最小成交量输入错误！',
+          type: 'warning'
         })
         return
       }
-      if (!this.dataList.procurementPlanType) {
+      if (this.dataList.minimumVolume.toString().indexOf('.') != -1 &&this.dataList.minimumVolume.toString().split('.')[1].length >2) {
         this.$message({
-          message: '类型不能为空',
-          type: 'warning',
+          message: '最小成交量输入错误！',
+          type: 'warning'
         })
         return
       }
-      if (!this.dataList.packingType) {
+      if (
+        this.dataList.procurementPrice > 100000 ||
+        this.dataList.procurementPrice < 0 ||
+        (String(this.dataList.procurementPrice).indexOf(
+          '.'
+        ) != -1 &&
+          String(this.dataList.procurementPrice).length -
+            (String(this.dataList.procurementPrice).indexOf(
+              '.'
+            ) +
+              1) >
+            2)
+      ) {
         this.$message({
-          message: '包装方式不能为空',
+          message: '采购价格输入错误',
           type: 'warning',
         })
         return
       }
       if (!this.dataList.buyer) {
         this.$message({
-          message: '买方不能为空',
-          type: 'warning',
+          message: '买方不能为空！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.dataList.buyer.length>25||this.dataList.buyer.length<1) {
+        this.$message({
+          message: '买方输入错误！',
+          type: 'warning'
         })
         return
       }
       if (!this.dataList.buyerPhone) {
         this.$message({
           message: '请输入买方电话！',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
-      if (isNaN(this.dataList.buyerPhone)) {
+      if (this.dataList.buyerPhone.length!=11) {
         this.$message({
-          message: '输入买方电话有误!',
-          type: 'warning',
+          message: '买方电话输入错误!',
+          type: 'warning'
         })
         return
       }
-      if (
-        this.dataList.buyerPhone.length < 6 ||
-        this.dataList.buyerPhone.length > 15
-      ) {
+      if (!this.dataList.waterContent) {
         this.$message({
-          message: '买方电话输入错误',
-          type: 'warning',
+          message: '水分不能为空！',
+          type: 'warning'
         })
         return
       }
-      if (!this.dataList.waterContent) {
+      if (this.dataList.waterContent>40||this.dataList.waterContent<1) {
         this.$message({
-          message: '水分不能为空',
-          type: 'warning',
+          message: '水分输入错误！',
+          type: 'warning'
+        })
+        return
+      }
+      if (String(this.dataList.waterContent).indexOf('.') != -1 &&
+          String(this.dataList.waterContent).length -
+            (String(this.dataList.waterContent).indexOf('.') + 1) >
+            2) {
+        this.$message({
+          message: '水分输入错误',
+          type: 'warning'
+        })
+        return
+      }
+      if (!this.dataList.bulkDensity) {
+        this.$message({
+          message: '容重不能为空！',
+          type: 'warning'
         })
         return
       }
       if (
-        !this.dataList.bulkDensity ||
-        (String(this.dataList.bulkDensity).indexOf('.') != -1 &&
+        this.dataList.bulkDensity&&String(this.dataList.bulkDensity).indexOf('.') != -1 &&
           String(this.dataList.bulkDensity).length -
             (String(this.dataList.bulkDensity).indexOf('.') + 1) >
-            2)
-      ) {
+            2||this.dataList.bulkDensity>1000||this.dataList.bulkDensity<500){
         this.$message({
           message: '容重输入错误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (
-        !this.dataList.impurity ||
-        (String(this.dataList.impurity).indexOf('.') != -1 &&
+        this.dataList.protein&&String(this.dataList.protein).indexOf('.') != -1 &&
+          String(this.dataList.protein).length -
+            (String(this.dataList.protein).indexOf('.') + 1) >
+            2||this.dataList.protein>80||this.dataList.protein<1){
+        this.$message({
+          message: '蛋白占比输入错误',
+          type: 'warning'
+        })
+        return
+      }
+      if (
+        this.dataList.impurity&&String(this.dataList.impurity).indexOf('.') != -1 &&
           String(this.dataList.impurity).length -
-            (String(this.dataList.impurity).indexOf('.') + 1) >
-            2)
-      ) {
+            (String(this.dataList.impurity).indexOf('.') + 1) >2
+            ||this.dataList.impurity>40||this.dataList.impurity<1) {
         this.$message({
           message: '杂质输入错误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (
-        !this.dataList.mildewGrain ||
-        (String(this.dataList.mildewGrain).indexOf('.') != -1 &&
+        this.dataList.mildewGrain&&String(this.dataList.mildewGrain).indexOf('.') != -1 &&
           String(this.dataList.mildewGrain).length -
             (String(this.dataList.mildewGrain).indexOf('.') + 1) >
-            2)
-      ) {
+            2||this.dataList.mildewGrain>40||this.dataList.mildewGrain<1) {
         this.$message({
           message: '霉变粒输入错误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (
-        !this.dataList.jiaorenli ||
-        (String(this.dataList.jiaorenli).indexOf('.') != -1 &&
+        this.dataList.jiaorenli&&String(this.dataList.jiaorenli).indexOf('.') != -1 &&
           String(this.dataList.jiaorenli).length -
             (String(this.dataList.jiaorenli).indexOf('.') + 1) >
-            2)
-      ) {
+            2||this.dataList.jiaorenli>40||this.dataList.jiaorenli<1) {
         this.$message({
           message: '热损伤输入错误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (
-        !this.dataList.imperfectGrain ||
-        (String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
+        this.dataList.imperfectGrain&&String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
           String(this.dataList.imperfectGrain).length -
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
-            2)
-      ) {
+            2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1) {
         this.$message({
           message: '不完整粒输入错误',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       this.dataList.id = this.$route.query.id
-      // this.deptList.flag = 0
       this.$confirm(`提交后该采购信息将发布到交易平台，是否确定提交？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -813,9 +871,6 @@ export default {
         .then(() => {
           this.$refs.dataList.validate((valid) => {
             if (valid) {
-              // this.dataList.sourceProvince = CodeToText[this.selectedOptions[0]]
-              // this.dataList.sourceCity = CodeToText[this.selectedOptions[1]]
-
               this.dataList.receivePrivate = CodeToText[this.selectedOptions[0]]
               this.dataList.receiveCity = CodeToText[this.selectedOptions[1]]
               this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
@@ -825,7 +880,7 @@ export default {
               this.dataList.compId = this.compId
               // this.dataList.pcFlag = 1
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
-
+              this.dataList.unitPrice=this.dataList.procurementPrice
               procurementEdit(this.dataList)
                 .toPromise()
                 .then((response) => {

src/views/purchasingManagement/procurementPlanList.vue

@@ -218,12 +218,12 @@
 import {
   procurementPlan,
   procurementDel,
+  billoperatehis,
   procurementEditOther,
 } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -409,9 +409,6 @@ export default {
         'm+': (date.getMonth() + 1).toString(), // 月
         'd+': date.getDate().toString(), // 日
         'H+': date.getHours().toString(), // 时
-        // "M+": date.getMinutes().toString(),         // 分
-        // "S+": date.getSeconds().toString()          // 秒
-        // 有其他格式化字符需求可以继续添加，必须转化成字符串
       }
       for (let k in opt) {
         ret = new RegExp('(' + k + ')').exec(fmt)
@@ -443,7 +440,7 @@ export default {
       if (row.showFlag == 1) {
         status = '已隐藏'
         num = 0
-        this.$confirm(`隐藏后交易信息不 再展示给客户，是否确定隐藏？`, {
+        this.$confirm(`隐藏后交易信息不再展示给客户，是否确定隐藏？`, {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
@@ -508,21 +505,6 @@ export default {
         }
       }
     },
-    handleSizeChange() {},
-    // fujian(row) {
-    //   if (
-    //     row.receiveAttachmentPath === null ||
-    //     row.receiveAttachmentPath === ''
-    //   ) {
-    //     EventBus.$emit(
-    //       'warning',
-    //       this.$t('system.noticeCircular.NoInformation')
-    //     )
-    //   } else {
-    //     this.accessoryTFs = true
-    //   }
-    //   this.appendixIdss = row.receiveAttachmentPath
-    // },
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
@@ -586,7 +568,7 @@ export default {
               .then((response) => {
                 this.$notify.success({
                   title: '成功',
-                  message: '状态修改成功',
+                  message: '基差修改成功',
                 })
                 this.getList()
               })
@@ -613,7 +595,7 @@ export default {
               .then((response) => {
                 this.$notify.success({
                   title: '成功',
-                  message: '状态修改成功',
+                  message: '单价修改成功',
                 })
                 this.getList()
               })

src/views/purchasingManagement/procurementPlanLook.vue

@@ -66,7 +66,9 @@
           </el-form-item>
           <!--收货库所在地区-->
           <el-form-item label="收货库所在地区" span="1">
+            <div class="forlist">
            {{dataList.receivePrivate}}{{dataList.receiveCity}}{{dataList.receiveArea}}
+            </div>
           </el-form-item>
           <!--运费承担方-->
           <el-form-item label="运费承担方">
@@ -133,8 +135,9 @@
           </el-form-item>
           <!--产地-->
           <el-form-item label="产地" span="1">
-            <!-- <el-input disabled></el-input>    -->
+            <div class="forlist">
             {{dataList.outputPrivate}}{{dataList.outputCity}}
+            </div>
           </el-form-item>
           <!--产出年份-->
           <el-form-item label="产出年份" span="1">
@@ -651,4 +654,14 @@ export default {
   width: 400px;
   height: 20px;
 }
+.forlist{
+  background-color: #F5F7FA;
+  border-radius: 10px;
+  width: 100%;
+  padding-left: 15px;
+  height: 35px;
+  line-height: 35px;
+  color: #C0C4CC;
+  font-size: 14px;
+}
 </style>

src/views/salesManagement/salesPlanAdd.vue

@@ -33,15 +33,16 @@
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 标题 -->
-          <el-form-item label="标题" span="1" prop="title">
+          <el-form-item label="标题" span="1" prop="title" >
             <el-input
               v-model="dataList.title"
               maxlength="16"
               placeholder="请输入标题，不超过16个字"
             />
+            <span class="unchangeable">*</span>
           </el-form-item>
           <!-- 货名 -->
-          <ws-form-item label="货名" span="1" prop="goodsName">
+          <ws-form-item label="货名" span="1" prop="goodsName" >
             <ws-select
               v-model="dataList.goodsName"
               placeholder
@@ -55,6 +56,7 @@
                 :value="item.constValue"
               />
             </ws-select>
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <!-- 计划销售量（吨） -->
           <el-form-item
@@ -67,16 +69,18 @@
               class="typeselect"
               placeholder="请输入计划销售量"
             />
+            <span class="unchangeable">*</span>
           </el-form-item>
           <!-- 最小成交量 -->
-          <el-form-item label="最小成交量（吨）" span="1" prop="minimumVolume">
+          <el-form-item label="最小成交量（吨）" span="1" prop="minimumVolume" >
             <el-input
               v-model="dataList.minimumVolume"
               placeholder="请输入最小成交量"
             />
+            <span class="unchangeable">*</span>
           </el-form-item>
           <!--类型-->
-          <ws-form-item label="类型" span="1" prop="salePlanType">
+          <ws-form-item label="类型" span="1" prop="salePlanType" >
             <ws-select
               v-model="dataList.salePlanType"
               placeholder
@@ -90,6 +94,7 @@
                 :value="item.constValue"
               />
             </ws-select>
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <!-- 价格类型 -->
           <ws-form-item label="价格类型" span="1" prop="priceType">
@@ -102,6 +107,7 @@
             prop="basisPrice"
           >
             <el-input v-model="dataList.basisPrice" placeholder="请输入基差" />
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item
             v-show="dataList.salePlanType == '现货'"
@@ -115,9 +121,10 @@
               size="small"
               placeholder="请输入销售价格"
             />
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <!--出货库-->
-          <ws-form-item label="出货库" span="1" prop="sendWarehouse">
+          <ws-form-item label="出货库" span="1" prop="sendWarehouse" >
             <ws-select
               v-model="dataList.sendWarehouse"
               placeholder
@@ -131,8 +138,9 @@
                 :value="item.warehouseName"
               />
             </ws-select>
+            <span class="unchangeable">*</span>
           </ws-form-item>
-          <ws-form-item label="出货库所在地区" span="1" prop="sendArea">
+          <ws-form-item label="出货库所在地区" span="1" prop="sendArea" > 
             <el-cascader
               :options="options_"
               v-model="selectedOptions"
@@ -142,6 +150,7 @@
               @change="handleChange"
               style="width: 200%"
             />
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item label="运费承担方" span="1" prop="freightPayer">
             <ws-select
@@ -158,7 +167,7 @@
               />
             </ws-select>
           </ws-form-item>
-          <ws-form-item label="包装方式" span="1" prop="packingType">
+          <ws-form-item label="包装方式" span="1" prop="packingType" >
             <ws-select
               v-model="dataList.packingType"
               placeholder
@@ -172,6 +181,7 @@
                 :value="item.constValue"
               />
             </ws-select>
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <el-form-item
             v-if="dataList.packingType != '散装'"
@@ -186,15 +196,16 @@
               placeholder="请输入装袋要求如：98斤，王中王彩袋"
             />
           </el-form-item>
-          <ws-form-item label="卖方" span="1" prop="seller">
+          <ws-form-item label="卖方" span="1" prop="seller" >
             <el-input
               maxlength="25"
               v-model="dataList.seller"
               size="small"
               placeholder="请输入卖方名称"
             />
+            <span class="unchangeable">*</span>
           </ws-form-item>
-          <el-form-item label="卖方电话" span="1" prop="sellerPhone">
+          <el-form-item label="卖方电话" span="1" prop="sellerPhone" >
             <el-input
               v-model="dataList.sellerPhone"
               filterable
@@ -202,6 +213,7 @@
               :filter-method="dataFilter"
               placeholder="请输入卖方电话"
             ></el-input>
+            <span class="unchangeable">*</span>
           </el-form-item>
           <div class="small-title"></div>
         </el-form>
@@ -211,19 +223,21 @@
           <h3>货物要求</h3>
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
-          <el-form-item label="水分(%)<=" span="1" prop="waterContent">
+          <el-form-item label="水分(%)<=" span="1" prop="waterContent" >
             <el-input
               v-model="dataList.waterContent"
               class="typeselect"
               placeholder="请输入水分占比"
             />
+            <span class="unchangeable">*</span>
           </el-form-item>
-          <el-form-item label="容重(g/l)<=" span="1" prop="bulkDensity">
+          <el-form-item label="容重(g/l)<=" span="1" prop="bulkDensity" >
             <el-input
               v-model="dataList.bulkDensity"
               class="typeselect"
               placeholder="请输入容重"
             />
+            <span class="unchangeable">*</span>
           </el-form-item>
           <el-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
             <el-input
@@ -721,7 +735,7 @@ export default {
       }
       if (!this.dataList.minimumVolume) {
         this.$message({
-          message: '最小交易量不能为空！',
+          message: '最小成交量不能为空！',
           type: 'warning',
         })
         return
@@ -731,7 +745,7 @@ export default {
         this.dataList.minimumVolume < 1
       ) {
         this.$message({
-          message: '最小交易量输入错误！',
+          message: '最小成交量输入错误！',
           type: 'warning',
         })
         return
@@ -741,7 +755,52 @@ export default {
         this.dataList.minimumVolume.split('.')[1].length > 2
       ) {
         this.$message({
-          message: '最小交易量输入错误！',
+          message: '最小成交量输入错误！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.dataList.basisPrice > 100000 ||
+        this.dataList.basisPrice < 0 ||
+        (String(this.dataList.basisPrice).indexOf(
+          '.'
+        ) != -1 &&
+          String(this.dataList.basisPrice).length -
+            (String(this.dataList.basisPrice).indexOf(
+              '.'
+            ) +
+              1) >
+            2)
+      ) {
+        this.$message({
+          message: '基差输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.dataList.salePrice > 100000 ||
+        this.dataList.salePrice < 0 ||
+        (String(this.dataList.salePrice).indexOf(
+          '.'
+        ) != -1 &&
+          String(this.dataList.salePrice).length -
+            (String(this.dataList.salePrice).indexOf(
+              '.'
+            ) +
+              1) >
+            2)
+      ) {
+        this.$message({
+          message: '销售价格输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.dataList.sendWarehouse) {
+        this.$message({
+          message: '请选择出货库',
           type: 'warning',
         })
         return
@@ -800,6 +859,13 @@ export default {
         })
         return
       }
+      if (!this.dataList.bulkDensity) {
+        this.$message({
+          message: '容重不能为空！',
+          type: 'warning'
+        })
+        return
+      }
       if (
         (this.dataList.bulkDensity &&
           String(this.dataList.bulkDensity).indexOf('.') != -1 &&
@@ -820,9 +886,7 @@ export default {
           String(this.dataList.protein).indexOf('.') != -1 &&
           String(this.dataList.protein).length -
             (String(this.dataList.protein).indexOf('.') + 1) >
-            2) ||
-        this.dataList.protein > 40 ||
-        this.dataList.protein < 1
+            2||this.dataList.protein>80||this.dataList.protein<1)
       ) {
         this.$message({
           message: '蛋白占比输入错误',
@@ -835,7 +899,7 @@ export default {
         String(this.dataList.impurity).indexOf('.') != -1 &&
         String(this.dataList.impurity).length -
           (String(this.dataList.impurity).indexOf('.') + 1) >
-          2
+          2||this.dataList.impurity>40||this.dataList.impurity<1
       ) {
         this.$message({
           message: '杂质输入错误',
@@ -848,7 +912,7 @@ export default {
         String(this.dataList.mildewGrain).indexOf('.') != -1 &&
         String(this.dataList.mildewGrain).length -
           (String(this.dataList.mildewGrain).indexOf('.') + 1) >
-          2
+          2||this.dataList.mildewGrain>40||this.dataList.mildewGrain<1
       ) {
         this.$message({
           message: '霉变粒输入错误',
@@ -861,7 +925,7 @@ export default {
         String(this.dataList.jiaorenli).indexOf('.') != -1 &&
         String(this.dataList.jiaorenli).length -
           (String(this.dataList.jiaorenli).indexOf('.') + 1) >
-          2
+          2||this.dataList.jiaorenli>40||this.dataList.jiaorenli<1
       ) {
         this.$message({
           message: '热损伤输入错误',
@@ -874,7 +938,7 @@ export default {
         String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
         String(this.dataList.imperfectGrain).length -
           (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
-          2
+          2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1
       ) {
         this.$message({
           message: '不完整粒输入错误',
@@ -899,6 +963,7 @@ export default {
               this.dataList.sendArea = CodeToText[this.selectedOptions[2]]
               this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
               this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
+              this.dataList.unitPrice=this.dataList.salePrice
 
               this.dataList.compId = this.compId
               this.dataList.pcFlag = 1
@@ -1211,14 +1276,18 @@ export default {
   width: 400px;
   height: 20px;
 }
-.readonly :after {
-  content: '*';
-  color: #ff2727;
+//*号
+.unchangeable {
   position: absolute;
-  right: 8px;
-  z-index: 10;
-  top: 21%;
-  font-size: 20px;
+  width: 9px;
+  height: 22px;
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #ff2727;
+  line-height: 22px;
+  display: inline-block;
+  right: -1px;
 }
 /deep/.typeselect .el-input__inner {
   color: #8890b1;

src/views/salesManagement/salesPlanEdit.vue

@@ -170,11 +170,11 @@
             />
           </el-form-item>
           <!-- 卖方 -->
-          <ws-form-item label="买方" span="1" prop="seller">
+          <ws-form-item label="卖方" span="1" prop="seller">
             <el-input v-model="dataList.seller" maxlength="120" size="small" placeholder="请输入卖方名称" />
           </ws-form-item>
           <!-- 卖方电话 -->
-          <el-form-item label="买方电话" span="1" prop="sellerPhone">
+          <el-form-item label="卖方电话" span="1" prop="sellerPhone">
             <el-input
               v-model="dataList.sellerPhone"
               filterable
@@ -623,9 +623,93 @@ export default {
         })
         return
       }
+      if (
+        this.dataList.plannedSaleVolume > 10000000 ||
+        this.dataList.plannedSaleVolume < 1
+      ) {
+        this.$message({
+          message: '计划销售量输入错误！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.dataList.plannedSaleVolume.toString().indexOf('.') != -1) {
+        if (this.dataList.plannedSaleVolume.toString().split('.')[1].length > 2) {
+          this.$message({
+            message: '计划销售量输入错误！',
+            type: 'warning',
+          })
+          return
+        }
+      }
       if (!this.dataList.minimumVolume) {
         this.$message({
-          message: '最小交易量不能为空！',
+          message: '最小成交量不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.dataList.minimumVolume > 10000000 ||
+        this.dataList.minimumVolume < 1
+      ) {
+        this.$message({
+          message: '最小成交量输入错误！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.dataList.minimumVolume.toString().indexOf('.') != -1 &&
+        this.dataList.minimumVolume.toString().split('.')[1].length > 2
+      ) {
+        this.$message({
+          message: '最小成交量输入错误！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.dataList.basisPrice > 100000 ||
+        this.dataList.basisPrice < 0 ||
+        (String(this.dataList.basisPrice).indexOf(
+          '.'
+        ) != -1 &&
+          String(this.dataList.basisPrice).length -
+            (String(this.dataList.basisPrice).indexOf(
+              '.'
+            ) +
+              1) >
+            2)
+      ) {
+        this.$message({
+          message: '基差输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.dataList.salePrice > 100000 ||
+        this.dataList.salePrice < 0 ||
+        (String(this.dataList.salePrice).indexOf(
+          '.'
+        ) != -1 &&
+          String(this.dataList.salePrice).length -
+            (String(this.dataList.salePrice).indexOf(
+              '.'
+            ) +
+              1) >
+            2)
+      ) {
+        this.$message({
+          message: '销售价格输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.dataList.sendWarehouse) {
+        this.$message({
+          message: '请选择出货库',
           type: 'warning',
         })
         return
@@ -684,6 +768,13 @@ export default {
         })
         return
       }
+      if (!this.dataList.bulkDensity) {
+        this.$message({
+          message: '容重不能为空！',
+          type: 'warning'
+        })
+        return
+      }
       if (
         (this.dataList.bulkDensity &&
           String(this.dataList.bulkDensity).indexOf('.') != -1 &&
@@ -704,9 +795,7 @@ export default {
           String(this.dataList.protein).indexOf('.') != -1 &&
           String(this.dataList.protein).length -
             (String(this.dataList.protein).indexOf('.') + 1) >
-            2) ||
-        this.dataList.protein > 40 ||
-        this.dataList.protein < 1
+            2||this.dataList.protein>80||this.dataList.protein<1)
       ) {
         this.$message({
           message: '蛋白占比输入错误',
@@ -719,7 +808,7 @@ export default {
         String(this.dataList.impurity).indexOf('.') != -1 &&
         String(this.dataList.impurity).length -
           (String(this.dataList.impurity).indexOf('.') + 1) >
-          2
+          2||this.dataList.impurity>40||this.dataList.impurity<1
       ) {
         this.$message({
           message: '杂质输入错误',
@@ -732,7 +821,7 @@ export default {
         String(this.dataList.mildewGrain).indexOf('.') != -1 &&
         String(this.dataList.mildewGrain).length -
           (String(this.dataList.mildewGrain).indexOf('.') + 1) >
-          2
+          2||this.dataList.mildewGrain>40||this.dataList.mildewGrain<1
       ) {
         this.$message({
           message: '霉变粒输入错误',
@@ -745,7 +834,7 @@ export default {
         String(this.dataList.jiaorenli).indexOf('.') != -1 &&
         String(this.dataList.jiaorenli).length -
           (String(this.dataList.jiaorenli).indexOf('.') + 1) >
-          2
+          2||this.dataList.jiaorenli>40||this.dataList.jiaorenli<1
       ) {
         this.$message({
           message: '热损伤输入错误',
@@ -758,7 +847,7 @@ export default {
         String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
         String(this.dataList.imperfectGrain).length -
           (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
-          2
+          2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1
       ) {
         this.$message({
           message: '不完整粒输入错误',
@@ -785,6 +874,7 @@ export default {
 
               this.dataList.compId = this.compId
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
+              this.dataList.unitPrice=this.dataList.salePrice
               saleEdit(this.dataList)
                 .toPromise()
                 .then((response) => {

src/views/salesManagement/salesPlanList.vue

@@ -61,18 +61,27 @@
             <div class="inputChenge">
               <el-input
                 v-model="scope.row.basisPrice"
-                @change="varietyClick(scope.row)"
-                class="inputs"
+                v-if="scope.row.identification == 'true'"
               ></el-input>
+              <div v-if="scope.row.identification == 'false'" class="inputs">
+                {{ scope.row.basisPrice }}
+              </div>
             </div>
             <img
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
-              @click="varietyClick(scope.row)"
+              @click="whether(scope.row)"
               alt=""
+              v-if="scope.row.identification == 'false'"
             />
+            <i
+              class="el-icon-check"
+              style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification == 'true'"
+              @click="varietyClick(scope.row)"
+            ></i>
           </div>
           <div v-else>—</div>
         </template>
@@ -84,18 +93,27 @@
               <!-- readonly -->
               <el-input
                 v-model="scope.row.unitPrice"
-                v-bind:class="inputs"
-                @change="varietyClick(scope.row)"
+                v-if="scope.row.identification == 'true'"
               ></el-input>
+              <div v-if="scope.row.identification == 'false'" class="inputs">
+                {{ scope.row.unitPrice }}
+              </div>
             </div>
             <img
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
-              @click="varietyClick(scope.row)"
+              @click="whether(scope.row)"
+              v-if="scope.row.identification == 'false'"
               alt=""
             />
+            <i
+              class="el-icon-check"
+              style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification == 'true'"
+              @click="varietyClick(scope.row)"
+            ></i>
           </div>
           <div v-else>—</div>
         </template>
@@ -273,6 +291,9 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          for (var i = 0; i < response.records.length; i++) {
+            response.records[i].identification = 'false'
+          }
           this.warehouseList = response
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
@@ -392,6 +413,9 @@ export default {
     handleClose() {
       this.accessoryTFs = false
     },
+    whether(row) {
+      row.identification = 'true'
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
@@ -408,7 +432,7 @@ export default {
       if (row.showFlag == 1) {
         status = '已隐藏'
         num = 0
-        this.$confirm(`隐藏后交易信息不 再展示给客户，是否确定隐藏？`, {
+        this.$confirm(`隐藏后交易信息不再展示给客户，是否确定隐藏？`, {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
@@ -532,7 +556,7 @@ export default {
               .then((response) => {
                 this.$notify.success({
                   title: '成功',
-                  message: '状态修改成功',
+                  message: '基差修改成功',
                 })
                 this.getList()
               })
@@ -558,7 +582,7 @@ export default {
               .then((response) => {
                 this.$notify.success({
                   title: '成功',
-                  message: '状态修改成功',
+                  message: '单价修改成功',
                 })
                 this.getList()
               })

src/views/salesManagement/salesPlanLook.vue

@@ -66,7 +66,9 @@
           </el-form-item>
           <!--出货库所在地区-->
           <el-form-item label="出货库所在地区" span="1">
+            <div class="forlist">
            {{dataList.sendPrivate}}{{dataList.sendCity}}{{dataList.sendArea}}
+            </div>
           </el-form-item>
           <!--运费承担方-->
           <el-form-item label="运费承担方">
@@ -133,8 +135,9 @@
           </el-form-item>
           <!--产地-->
           <el-form-item label="产地" span="1">
-            <!-- <el-input disabled></el-input>    -->
+            <div class="forlist">
             {{dataList.outputPrivate}}{{dataList.outputCity}}
+            </div>
           </el-form-item>
           <!--产出年份-->
           <el-form-item label="产出年份" span="1">
@@ -658,4 +661,14 @@ export default {
   width: 400px;
   height: 20px;
 }
+.forlist{
+  background-color: #F5F7FA;
+  border-radius: 10px;
+  width: 100%;
+  padding-left: 15px;
+  height: 35px;
+  line-height: 35px;
+  color: #C0C4CC;
+  font-size: 14px;
+}
 </style>

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -47,10 +47,10 @@
       </el-col>
       </el-row>
       <div v-if='contractNo!=""'>
-        <span>合同重量:吨</span>
-      <span>成交量:吨</span>
-      <span>已平仓:吨</span>
-      <span>入库量:吨</span>
+      <span>合同重量:{{orderList.transactionsNumber}}吨</span>
+      <span>成交量:{{orderList.cumulativeTurnover}}吨</span>
+      <span>已平仓:{{orderList.closedPosition}}吨</span>
+      <span>入库量:{{orderList.stockInQuantity}}吨</span>
       </div>
       
       <el-table
@@ -447,6 +447,7 @@ import {
   getpurchreceipt,
   getpurchaseincontractno,
   postamend,
+  getorder,
   postreplanishent,
   postaudit,
   postpaymoney,
@@ -538,6 +539,7 @@ export default {
       roleId: sessionStorage.getItem('ws-pf_roleId'),
       deptCircularPage: {},
       warehouseList: [],
+      orderList:{},
       deptBudgetList: {},
       id: '',
 
@@ -939,6 +941,13 @@ export default {
     },
     contractchange(e) {
       this.contractNo = e
+        getorder({
+        contractNo: this.contractNo
+      })
+        .toPromise()
+        .then((response) => {
+          this.orderList = response
+        })
       this.getList()
     },
     updated() {

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -50,10 +50,10 @@
         </el-col>
       </el-row>
         <div v-if='contractNo!=""'>
-          <span>合同重量:吨</span>
-          <span>成交量:吨</span>
-          <span>已平仓:吨</span>
-          <span>入库量:吨</span>
+        <span>合同重量:{{orderList.transactionsNumber}}吨</span>
+        <span>成交量:{{orderList.cumulativeTurnover}}吨</span>
+        <span>已平仓:{{orderList.closedPosition}}吨</span>
+        <span>出库量:{{orderList.stockOutQuantity}}吨</span>
         </div>
         
         <el-table
@@ -235,6 +235,7 @@ import {
   getsaleoutcontractno,
   finalsettlementprice,
   issueapproval,
+  getsaleorder,
   cashierpayment,
   salesinvoicing,
   salesbatchinvoicing
@@ -290,6 +291,7 @@ export default {
       barHeight: 0,
       retioX: 1,
       ratioY: 1,
+      orderList:{},
       isTaped: false,
       isHover: false,
       isShow: !this.autohide,
@@ -468,6 +470,13 @@ export default {
     },
     contractchange(e){ 
       this.contractNo=e
+      getsaleorder({
+        contractNo: this.contractNo
+      })
+        .toPromise()
+        .then((response) => {
+          this.orderList = response
+        })
       this.getList()
     },
     updated() {