snow 2 years ago
parent
commit
7abd519a8d

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.js


+ 1 - 1
src/styles/element-ui.scss

@@ -115,7 +115,7 @@
 
 .el-button--primary.is-plain:hover{
   color: #6954f0 !important;
-  background-color: #f0eefe !important;
+  background-color: #ecf5ff !important;
   border-color: #c3bbf9;
 }
 

+ 2 - 2
src/styles/element-variables.scss

@@ -102,14 +102,14 @@ $--color-warning: #ffba00;
 $--color-success-lighter: #e7faf0;
 $--color-success-light: #d0f5e0;
 $--color-success: #13ce66;
-$--color-primary-light-9: #f0eefe;
+$--color-primary-light-9: #ecf5ff;
 $--color-primary-light-8: #e1ddfc;
 $--color-primary-light-7: #d2ccfb;
 $--color-primary-light-6: #c3bbf9;
 $--color-primary-light-5: #b4aaf8;
 $--color-primary-light-4: #a598f6;
 $--color-primary-light-3: #9687f5;
-$--color-primary-light-2: #8776f3;
+$--color-primary-light-2: #409eff;
 $--color-primary-light-1: #7865f2;
 $--color-primary: #409EFF;
 $--color-black: #515a6e;

+ 2 - 2
src/views/sellOut/sellReturn/detail.vue

@@ -156,7 +156,7 @@
                 @searchChange="examForm"
               />
             </el-collapse-item>
-            <el-collapse-item title="待供应商审核" name="4" v-if="isHasPermission({status:'9', process:'9'}) && sitem.has_account === '0'">
+            <el-collapse-item title="待供应商审核" name="4" v-if="isHasPermission({status:'9', process:'9'}) && String(sitem.has_account) === '0'">
               <exam-form
                 v-if="newTime"
                 :statusList="statusList"
@@ -170,7 +170,7 @@
               <approval-results :sitem="sitem" @changeStatus="handlePurchaseExam" />
             </el-collapse-item>
             
-            <el-collapse-item title="业务公司修改,待供应商确认" name="6" v-if="isHasPermission({status:'10', process:'10'}) && sitem.has_account === '0'">
+            <el-collapse-item title="业务公司修改,待供应商确认" name="6" v-if="isHasPermission({status:'10', process:'10'}) && String(sitem.has_account) === '0'">
               <exam-form
                 v-if="newTime"
                 :statusList="statusList"

+ 1 - 1
src/views/sellOut/sellReturn/index.vue

@@ -281,7 +281,7 @@
             ></i>
           </el-tooltip>
 
-          <el-tooltip content="撤销" placement="top" v-if="cancelStatus.includes(scope.row.status)">
+        <el-tooltip content="撤销" placement="top" v-if="cancelStatus.includes(scope.row.status) && powers.includes('006')">
              <i class="el-icon-refresh-right tb-icon"  @click="handleOrderCancel(scope.row)"  />
           </el-tooltip>
         </template>

Some files were not shown because too many files changed in this diff