修改缺陷

src/views/contractManagement/futuresSalesContract.vue

@@ -475,6 +475,7 @@ export default {
               arr = this.contractList.records[i].addressUrl.split(',')
               this.addressUrls[i] = arr
             }
+             this.contractList.records[i].basisPrice = '+'+this.contractList.records[i].basisPrice
           }
         })
     },

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -258,7 +258,7 @@
               unlink-panels
               value-format='yyyy'
               range-separator="至"
-              placeholder="开始日期"
+              placeholder="产出年份"
             ></el-date-picker>
           </el-form-item>
         </el-form>
@@ -680,7 +680,7 @@ export default {
         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){
+            2||this.dataList.basisPrice>10000||this.dataList.basisPrice<-10000){
         this.$message({
           message: '基差输入错误',
           type: 'warning'
@@ -857,7 +857,7 @@ export default {
               this.dataList.outputPrivate =
                 CodeToText[this.selectedOptions1[0]]
               this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
-
+              this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
               this.dataList.compId = this.compId
               this.dataList.unitPrice=this.dataList.procurementPrice
               

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -322,7 +322,7 @@
               align="right"
               unlink-panels
               range-separator="至"
-              placeholder="开始日期"
+              placeholder="产出年份"
             ></el-date-picker>
           </el-form-item>
         </el-form>
@@ -736,6 +736,17 @@ export default {
           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<-10000){
+        this.$message({
+          message: '基差输入错误',
+          type: 'warning'
+        })
+        return
       }
       if (!this.dataList.buyer) {
         this.$message({
@@ -876,7 +887,7 @@ export default {
               this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
               this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
               this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
-
+              this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)
               this.dataList.compId = this.compId
               // this.dataList.pcFlag = 1
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')

src/views/purchasingManagement/procurementPlanList.vue

@@ -42,7 +42,8 @@
         class="table_td"
         prop="procurementPlanNo"
         label="采购计划编号"
-      ></el-table-column>
+      >
+      </el-table-column>
       <el-table-column
         class="table_td"
         prop="title"
@@ -246,7 +247,6 @@ export default {
       year: '',
       pickerOptions: {},
       value2: '',
-      handleSizeChange: '',
       deptBudgetTotal: 0,
       currentPage: 1,
       // tranTypeKey: 1,
@@ -553,7 +553,7 @@ export default {
           .then(() => {
             procurementEditOther({
               flag: 1,
-              basisPrice: row.basisPrice,
+              basisPrice: '-'+Math.abs(row.basisPrice),
               id: row.id,
             })
               .toPromise()

src/views/purchasingManagement/procurementPlanLook.vue

@@ -141,7 +141,15 @@
           </el-form-item>
           <!--产出年份-->
           <el-form-item label="产出年份" span="1">
-            <el-input v-model="dataList.outputYear" size="small" disabled />
+             <el-date-picker
+              disabled
+              v-model="dataList.outputYear"
+              type="year"
+              align="right"
+              unlink-panels
+              range-separator="至"
+              placeholder="产出年份"
+            ></el-date-picker>
           </el-form-item>
         </el-form>
       </div>
@@ -266,11 +274,8 @@ export default {
   },
   methods: {
     //返回按钮
-    revert() {
-      this.$router.go(-1)
-    },
     returnsales() {
-      this.$router.push({ path: 'procurementPlanList' })
+      this.$router.go(-1)
     },
     // 获取当前年月日
     getdate() {

src/views/purchasingManagement/purchaseOrderList.vue

@@ -66,7 +66,11 @@
         prop="procurementPlan"
         label="采购计划"
         width="125"
-      ></el-table-column>
+      >
+      <template slot-scope="scope">
+       <div class="record"
+              @click="lookPlan(scope.row)">{{ scope.row.procurementPlan}}</div>
+      </template></el-table-column>
       <el-table-column class="table_td" prop="customer" label="客户">
         <template slot-scope="scope">
           <div class="record" @click="customer(scope.row)">
@@ -266,23 +270,33 @@
         prop="updateDate"
         width="130"
       >
-        <template slot-scope="scope"
-          ><span v-if="scope.row.procurementPlanType != '现货'"
-            >--</span
-          ></template
-        ></el-table-column
-      >
+        <template slot-scope="scope" >
+                 <div
+              class="record"
+              @click="nocomplete1(scope.row)"
+              v-if="scope.row.procurementPlanType != '现货'&&scope.row.receiptUnpaid != null&&scope.row.receiptUnpaid >0">去结算</div>
+                <div
+              class="record"
+              @click="nocomplete1(scope.row)"
+              v-else-if="scope.row.procurementPlanType != '现货'&&scope.row.receiptUnpaid != null&&scope.row.receiptUnpaid==0">已结算</div>
+          </template>
+          </el-table-column >
       <el-table-column
         class="table_td"
         label="平仓结算"
         prop="updateDate"
-        width="130"
-        ><template slot-scope="scope"
-          ><span v-if="scope.row.procurementPlanType != '现货'"
-            >--</span
-          ></template
-        ></el-table-column
-      >
+        width="130">
+        <template slot-scope="scope">
+             <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-if="scope.row.procurementPlanType != '现货'&&scope.row.closedUnpaid != null&&scope.row.closedUnpaid >0">去结算</div>
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-else-if="scope.row.procurementPlanType != '现货'&&scope.row.closedUnpaid != null&&scope.row.closedUnpaid ==0">已结算</div>
+          </template>
+          </el-table-column >
       <el-table-column prop="seller" label="操作" width="310">
         <template slot-scope="scope">
           <!-- <div v-if="scope.row.procurementPlanType != '现货'"> -->
@@ -999,6 +1013,26 @@ export default {
     whether(row) {
       row.identification = 'true'
     },
+    nocomplete1(row) {
+      this.$router.push({
+        name: 'purchaseReceiptStatisticsList',
+        query: {
+       compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize
+        },
+      })
+    },
+    nocomplete(row) {
+      this.$router.push({
+        name: 'purchaseClosingCashierList',
+        query: {
+       compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize
+        },
+      })
+    },
     handle(item) {
       this.$confirm(`状态修改为已完成后不可再进行交易操作，是否确定修改？`, {
         confirmButtonText: '确定',
@@ -1586,12 +1620,12 @@ export default {
         }
       })
     },
-    //查看
-    handleLook(row) {
+    //查看计划
+    lookPlan(row) {
       this.$router.push({
-        path: 'warehouseManagementPutOutLook',
+        path: 'procurementPlanLook',
         query: {
-          relevanceId: row.relevanceId,
+          id: row.planId,
         },
       })
     },

src/views/salesManagement/salesPlanAdd.vue

@@ -321,7 +321,7 @@
               align="right"
               unlink-panels
               range-separator="至"
-              placeholder="开始日期"
+              placeholder="产出年份"
             ></el-date-picker>
           </el-form-item>
         </el-form>

src/views/salesManagement/salesPlanEdit.vue

@@ -271,7 +271,7 @@
               align="right"
               unlink-panels
               range-separator="至"
-              placeholder="开始日期"
+              placeholder="产出年份"
             ></el-date-picker>
           </el-form-item>
         </el-form>

src/views/salesManagement/salesPlanList.vue

@@ -64,7 +64,7 @@
                 v-if="scope.row.identification == 'true'"
               ></el-input>
               <div v-if="scope.row.identification == 'false'" class="inputs">
-                {{ scope.row.basisPrice }}
+                {{ '+'+scope.row.basisPrice }}
               </div>
             </div>
             <img
@@ -243,7 +243,6 @@ export default {
       year: '',
       pickerOptions: {},
       value2: '',
-      handleSizeChange: '',
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,

src/views/salesManagement/salesPlanLook.vue

@@ -140,8 +140,16 @@
             </div>
           </el-form-item>
           <!--产出年份-->
-          <el-form-item label="产出年份" span="1">
-            <el-input v-model="dataList.outputYear" size="small" disabled />
+           <el-form-item label="产出年份" span="1" prop="outputYear">
+           <el-date-picker
+              disabled
+              v-model="dataList.outputYear"
+              type="year"
+              align="right"
+              unlink-panels
+              range-separator="至"
+              placeholder="产出年份"
+            ></el-date-picker>
           </el-form-item>
         </el-form>
       </div>
@@ -259,8 +267,12 @@ export default {
       accessoryTFs: false
     }
   },
-  mounted() {
+  activated() {
     this.getList()
+    this.showType = this.isShow
+  },
+  mounted() {
+    this.dataList.id = this.$route.query.id
   },
   methods: {
     //返回按钮

src/views/salesManagement/salesPlanOrderList.vue

@@ -313,13 +313,33 @@
         label="出库结算"
         prop=""
         width="130"
-      ></el-table-column>
+      >
+        <template slot-scope="scope" >
+                 <div
+              class="record"
+              @click="nocomplete1(scope.row)"
+              v-if="scope.row.procurementPlanType != '现货'&&scope.row.deliveryUnpaid != null&&scope.row.deliveryUnpaid >0">去结算</div>
+                <div
+              class="record"
+              @click="nocomplete1(scope.row)"
+              v-else-if="scope.row.procurementPlanType != '现货'&&scope.row.deliveryUnpaid != null&&scope.row.deliveryUnpaid==0">已结算</div>
+          </template></el-table-column>
       <el-table-column
         class="table_td"
         label="平仓结算"
         prop=""
         width="130"
-      ></el-table-column>
+      >
+      <template slot-scope="scope">
+             <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-if="scope.row.procurementPlanType != '现货'&&scope.row.closedUnpaid != null&&scope.row.closedUnpaid >0">去结算</div>
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-else-if="scope.row.procurementPlanType != '现货'&&scope.row.closedUnpaid != null&&scope.row.closedUnpaid ==0">已结算</div>
+          </template></el-table-column>
       <el-table-column prop="seller" label="操作" width="360">
         <template slot-scope="scope">
           <!---成交-->
@@ -1012,6 +1032,26 @@ export default {
         }
       }
     },
+    nocomplete1(row) {
+      this.$router.push({
+        name: 'salesDeliveryReportList',
+        query: {
+       compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize
+        },
+      })
+    },
+    nocomplete(row) {
+      this.$router.push({
+        name: 'salesClosingCashierList',
+        query: {
+       compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize
+        },
+      })
+    },
     //完成
     handle(item) {
       this.$confirm(`状态修改为已完成后不可再进行交易操作，是否确定修改？`, {