瀏覽代碼

修改缺陷

zhangyuewww 3 年之前
父節點
當前提交
524f30e496

+ 1 - 1
src/views/contractManagement/futuresPurchaseContractExamine.vue

@@ -379,7 +379,7 @@ export default {
       this.dialogViewSpareMoney = false
     },
     returnsales() {
-      this.$router.push({ path: 'futuresPurchaseContract' })
+      this.$router.go(-1)
     },
     confirmationsheet() {
       this.$router.push({ path: 'priceConfirmationSheet',

+ 1 - 1
src/views/contractManagement/futuresSalesContractExamine.vue

@@ -376,7 +376,7 @@ export default {
       this.dialogViewSpareMoney = false
     },
     returnsales() {
-      this.$router.push({ path: 'futuresSalesContract' })
+      this.$router.go(-1)
     },
     confirmationsheet() {
       this.$router.push({ path: 'priceConfirmationSheet',

+ 2 - 2
src/views/contractManagement/purchaseContractExamine.vue

@@ -1,4 +1,4 @@
-<!--销售合同-->
+<!--采购合同查看-->
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
   <div class="container">
@@ -354,7 +354,7 @@ export default {
       this.dialogViewSpareMoney = false
     },
     returnsales() {
-      this.$router.push({ path: 'buyContract' })
+      this.$router.go(-1)
     },
   },
 }

+ 1 - 1
src/views/contractManagement/salesContractExamine.vue

@@ -460,7 +460,7 @@ export default {
     },
 
     returnsales() {
-      this.$router.push({ path: 'salesContract' })
+      this.$router.go(-1)
     },
   },
 }

+ 2 - 2
src/views/platformaudit/saletransactioninformationreview.vue

@@ -293,7 +293,7 @@ export default {
     adopt(row) {
       this.salePlanInfo.id = row.id
       this.salePlanInfo.flag = 1
-      this.$confirm(`确定通过该认证信息?`, '提示', {
+      this.$confirm(`确定通过该交易信息?`, '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '取消',
         type: 'warning',
@@ -322,7 +322,7 @@ export default {
     reject(row) {
        this.salePlanInfo.id = row.id
        this.salePlanInfo.flag = 2
-      this.$confirm(`确定驳回该认证信息?`, '提示', {
+      this.$confirm(`确定驳回该交易信息?`, '提示', {
         confirmButtonText: '驳回',
         cancelButtonText: '取消',
         type: 'warning',

+ 2 - 2
src/views/platformaudit/transactioninformationreview.vue

@@ -293,7 +293,7 @@ export default {
     adopt(row) {
       this.procurementPlanInfo.id = row.id
       this.procurementPlanInfo.flag = 1
-      this.$confirm(`确定通过该认证信息?`, '提示', {
+      this.$confirm(`确定通过该交易信息?`, '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '取消',
         type: 'warning',
@@ -322,7 +322,7 @@ export default {
     reject(row) {
        this.procurementPlanInfo.id = row.id
        this.procurementPlanInfo.flag = 2
-      this.$confirm(`确定驳回该认证信息?`, '提示', {
+      this.$confirm(`确定驳回该交易信息?`, '提示', {
         confirmButtonText: '驳回',
         cancelButtonText: '取消',
         type: 'warning',

+ 24 - 1
src/views/purchasingManagement/purchaseOrderList.vue

@@ -60,7 +60,11 @@
         prop="contractNo"
         label="合同编号"
         width="100"
-      ></el-table-column>
+      >
+        <template slot-scope="scope">
+       <div class="record"
+              @click="lookContract(scope.row)">{{ scope.row.contractNo}}</div>
+      </template></el-table-column>
       <el-table-column
         class="table_td"
         prop="procurementPlan"
@@ -1629,6 +1633,25 @@ export default {
         },
       })
     },
+    //查看合同
+    lookContract(row) {
+      if(row.goodsType==1){
+       this.$router.push({
+        name: 'purchaseContractExamine',
+        query: {
+          id: row.contractId,
+        },
+      })
+      }
+      else{
+      this.$router.push({
+        name: 'futuresPurchaseContractExamine',
+        query: {
+          id: row.contractId,
+        },
+      })
+      }
+    },
     //返回
     revert() {
       this.$router.push({ path: 'warehouseManagementList' })

+ 1 - 4
src/views/salesManagement/salesPlanLook.vue

@@ -276,11 +276,8 @@ export default {
   },
   methods: {
     //返回按钮
-    revert() {
-      this.$router.go(-1)
-    },
     returnsales() {
-      this.$router.push({ path: 'salesPlanList' })
+       this.$router.go(-1)
     },
     // 获取当前年月日
     getdate() {

+ 37 - 3
src/views/salesManagement/salesPlanOrderList.vue

@@ -55,20 +55,26 @@
       height="700"
     >
       <el-table-column type="index" label="序号" width="50"></el-table-column>
-      <el-table-column
+       <el-table-column
         class="table_td"
         prop="contractNo"
         label="合同编号"
         width="100"
       >
-      </el-table-column>
+        <template slot-scope="scope">
+       <div class="record"
+              @click="lookContract(scope.row)">{{ scope.row.contractNo}}</div>
+      </template></el-table-column>
       <el-table-column
         class="table_td"
         prop="salePlan"
         label="销售计划"
         width="130"
       >
-      </el-table-column>
+      <template slot-scope="scope">
+       <div class="record"
+              @click="lookPlan(scope.row)">{{ scope.row.salePlan}}</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)">
@@ -1056,6 +1062,34 @@ export default {
         },
       })
     },
+    //查看计划
+    lookPlan(row) {
+      this.$router.push({
+        path: 'salesPlanLook',
+        query: {
+          id: row.planId,
+        },
+      })
+    },
+    //查看合同
+    lookContract(row) {
+      if(row.goodsType==1){
+       this.$router.push({
+        name: 'salesContractExamine',
+        query: {
+          id: row.contractId,
+        },
+      })
+      }
+      else{
+      this.$router.push({
+        name: 'futuresSalesContractExamine',
+        query: {
+          id: row.contractId,
+        },
+      })
+      }
+    },
     //完成
     handle(item) {
       this.$confirm(`状态修改为已完成后不可再进行交易操作,是否确定修改?`, {