大中型我的订单页面修改

src/views/major/myOrder.vue

@@ -114,16 +114,37 @@
             <span>{{ row.owner }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="库存状态" align="center"
+        prop="owner" v-if="!hiddenLabels.includes('repertoryState')">
+          <template slot-scope="{row}">
+            <span>{{ row.repertoryState }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="送达状态" align="center"
         prop="delivery" v-if="!hiddenLabels.includes('delivery')" width='120'>
           <template slot-scope="{row}">
             <span v-if="row.delivery">{{ row.delivery ? '已送达' : '--' }}</span>
-            <el-button v-else-if="!row.delivery && row.production" type="text" @click="noTaskConfirmDelivery(row.id)">标记送达</el-button>
+            <el-button v-else-if="row.repertoryState=='已出库' && !row.delivery && row.production" type="text" @click="noTaskConfirmDelivery(row.id)">标记送达</el-button>
+            <el-tooltip v-else-if="row.repertoryState!='已出库' && !row.delivery && row.production" class="item" effect="light" content="产品未出库无法标记送达" placement="top-start">
+              <el-button type="text" @click="noTaskConfirmDelivery(row.id)" disabled>标记送达</el-button>
+            </el-tooltip>
             <span v-else>--</span>
           </template>
         </el-table-column>
+        <el-table-column label="客户经理申报提成" align="center"
+        prop="created" v-if="!hiddenLabels.includes('mdeclareResult')">
+          <template slot-scope="{row}">
+            <span>{{ row.mdeclareResult==null?'未申报': row.mdeclareResult}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="评估人员申报提成" align="center"
+        prop="created" v-if="!hiddenLabels.includes('edeclareResult')">
+          <template slot-scope="{row}">
+            <span>{{ row.edeclareResult==null?'未申报':row.edeclareResult  }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="下单时间" align="center"
-        prop="created" v-if="!hiddenLabels.includes('created')" width='200'>
+        prop="created" v-if="!hiddenLabels.includes('created')" width='180'>
           <template slot-scope="{row}">
             <span>{{ row.created }}</span>
           </template>