gjy há 3 anos atrás
pai
commit
17fcd1e488

+ 5 - 6
src/views/contractManagement/purchaseContract.vue

@@ -73,7 +73,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column width='150' prop="status" label="状态">
       <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
         <template slot-scope="scope">
-          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'&&scope.row.status !='已驳回'">
+          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
             <!-- <span v-if="scope.row.approveStatus">{{
             <!-- <span v-if="scope.row.approveStatus">{{
               scope.row.approveStatus
               scope.row.approveStatus
             }}</span> -->
             }}</span> -->
@@ -122,9 +122,6 @@
               style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
               style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
               @click="editClick(scope.row)" alt="" /> -->
               @click="editClick(scope.row)" alt="" /> -->
           </div>
           </div>
-          <div v-else-if="scope.row.status == '已驳回'">
-            已驳回
-          </div>
           <div v-else>
           <div v-else>
             <!-- {{scope.row.status}} -->
             <!-- {{scope.row.status}} -->
             <el-select v-model="scope.row.status" placeholder="" class="statusselect"
             <el-select v-model="scope.row.status" placeholder="" class="statusselect"
@@ -170,6 +167,7 @@
                v-hasPermission="
                v-hasPermission="
               `contractManagement.nonContract.nonContractInfo.view`"
               `contractManagement.nonContract.nonContractInfo.view`"
              @click="handlecost(scope.row)" alt="" />
              @click="handlecost(scope.row)" alt="" />
+             
           <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
           <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
             src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.view`
               `contractManagement.buyContract.buyContractInfo.view`
@@ -214,6 +212,7 @@
     billoperatehis,
     billoperatehis,
     deletecontract,
     deletecontract,
     editInfo,
     editInfo,
+    
   } from '@/model/contarct/index'
   } from '@/model/contarct/index'
   import {
   import {
     downloadFile
     downloadFile
@@ -250,8 +249,8 @@
         tableDate: [],
         tableDate: [],
         size: 10,
         size: 10,
         statusList:[{
         statusList:[{
-          value:'发运结束',
-        },{value:'已完成',}],
+          value:'已完成',
+        },{value:'发运结束',}],
         // 是否显示
         // 是否显示
         showType: true,
         showType: true,
         // 年
         // 年

+ 4 - 2
src/views/contractManagement/salesContract.vue

@@ -167,9 +167,11 @@
                 vertical-align: text-top;
                 vertical-align: text-top;
                 position: relative;
                 position: relative;
                 top: -1px;
                 top: -1px;
-                margin: 0 6px;
-              "  src="../../../public/img/daichu.png"
+                margin: 0 6px; " 
+               v-hasPermission="
+              `contractManagement.nonContract.nonContractInfo.view`" src="../../../public/img/daichu.png"
              @click="handlecost(scope.row)" alt="" />
              @click="handlecost(scope.row)" alt="" />
+             
           <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
           <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
             src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.view`
               `contractManagement.salesContract.salesContractInfo.view`