caojunjie преди 2 години
родител
ревизия
4c937c604b
променени са 2 файла, в които са добавени 20 реда и са изтрити 17 реда
  1. 9 5
      src/views/exportTrade/salesContract/components/goodsInfo.vue
  2. 11 12
      src/views/exportTrade/salesContract/detailsPage.vue

+ 9 - 5
src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -11,15 +11,16 @@
 <!--          <el-button type="warning" icon="el-icon-plus" size="small"-->
 <!--            :disabled="detailData.status == 1 || orderItemIds.length == 0" @click="getInvoice">生成发货单-->
 <!--          </el-button>-->
-          <el-button type="info" size="small" @click="cnameData">刷新基础资料</el-button>
-          <el-button type="info" size="small" @click="calculate(1)" :disabled="detailData.status == 1"
+          <el-button type="primary" size="small" @click="cnameData">刷新基础资料</el-button>
+          <el-button type="success" size="small" @click="calculate(1)" :disabled="detailData.status == 1"
             :loading="calculateLoading">分摊国内费用
           </el-button>
-          <el-button type="info" size="small" @click="calculate(2)" :disabled="detailData.status == 1"
+          <el-button type="success" size="small" @click="calculate(2)" :disabled="detailData.status == 1"
             :loading="calculateLoading">分摊海运费
           </el-button>
-          <el-button :type="form.fudaPurchaseStatus?'success':'info'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 1">通知采购</el-button>
-          <el-button :type="form.documentaryStatus?'warning':'info'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 2">通知跟单</el-button>
+          <el-button :type="form.fudaPurchaseStatus?'success':'warning'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 1">通知采购</el-button>
+          <el-button :type="form.documentaryStatus?'primary':'warning'" size="small" :disabled="!form.id" @click.native="dialog = true;fudaSatus = 2">通知跟单</el-button>
+          <el-button type="primary" size="small" :disabled="form.status > 0 || !form.status" @click.native="pleaseCheck">请核数据</el-button>
         </el-row>
       </template>
       <template slot="headerSerial">
@@ -851,6 +852,9 @@ export default {
         }
       });
     },
+      pleaseCheck(){
+        this.$parent.pleaseCheck()
+      },
     calculate(val) {
       this.form.totalValue = 0
       this.data.forEach((e, index) => {

+ 11 - 12
src/views/exportTrade/salesContract/detailsPage.vue

@@ -10,17 +10,17 @@
                 <el-button type="primary" size="small" v-if="detailData.status == 1" class="el-button--small-yh "
                            @click.stop="openEdit">编辑
                 </el-button>
-                <el-dropdown style="margin-right: 8px;margin-left: 8px;">
-                    <el-button type="primary" size="small">
-                        审核处理<i class="el-icon-arrow-down el-icon--right"></i>
-                    </el-button>
-                    <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item :disabled="form.status > 0" @click.native="pleaseCheck">请核数据
-                        </el-dropdown-item>
-                        <el-dropdown-item disabled>审核进度</el-dropdown-item>
-                        <el-dropdown-item disabled>撤销请核</el-dropdown-item>
-                    </el-dropdown-menu>
-                </el-dropdown>
+<!--                <el-dropdown style="margin-right: 8px;margin-left: 8px;">-->
+<!--                    <el-button type="primary" size="small">-->
+<!--                        审核处理<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+<!--                    </el-button>-->
+<!--                    <el-dropdown-menu slot="dropdown">-->
+<!--                        <el-dropdown-item :disabled="form.status > 0" @click.native="pleaseCheck">请核数据-->
+<!--                        </el-dropdown-item>-->
+<!--                        <el-dropdown-item disabled>审核进度</el-dropdown-item>-->
+<!--                        <el-dropdown-item disabled>撤销请核</el-dropdown-item>-->
+<!--                    </el-dropdown-menu>-->
+<!--                </el-dropdown>-->
                 <el-dropdown style="margin-right: 8px;">
           <el-button type="warning" size="small">
             账单处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -225,7 +225,6 @@
         <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel"
           @selection-change="goodsSelectionChange" @saveColumn="saveColumn" @resetColumn="resetColumn"
           :summary-method="summaryMethod" :cell-style="cellStyle" @row-dblclick="handleRowDBLClick">
-
           <template slot="menuLeft">
             <el-row>
               <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newDetails"