浏览代码

Finish Hotfix-mo-23

莫绍宝 3 年之前
父节点
当前提交
d5d02ec09b

+ 1 - 1
src/views/supply/adjust/adjust_list.vue

@@ -55,7 +55,7 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fr">
           <div class="fr">
-            <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'direct/export'" :exParams="exParams" />
           </div>
           </div>
         </div>
         </div>
         <div class="table">
         <div class="table">

+ 2 - 5
src/views/supply/apply/components/apply_form.vue

@@ -227,7 +227,7 @@ export default {
       warehouseList: [],
       warehouseList: [],
       isShowDialog: false,
       isShowDialog: false,
       screenForm: {
       screenForm: {
-        warehouse: [],
+        warehouse: '',
         type: '',
         type: '',
         orderNum: '',
         orderNum: '',
       },
       },
@@ -352,7 +352,7 @@ export default {
             let newItem = newGoodsList[j]
             let newItem = newGoodsList[j]
             if(newItem.orderId === oldItem.orderId){
             if(newItem.orderId === oldItem.orderId){
               newGoodsList[j].selected = true;
               newGoodsList[j].selected = true;
-              newGoodsList[j].invoiceNum = oldGoodsList[j].invoiceNum;
+              newGoodsList[j].invoiceNum = oldGoodsList[i].invoiceNum;
               break;
               break;
             }
             }
           }
           }
@@ -374,9 +374,6 @@ export default {
 
 
     // 点击 选择商品
     // 点击 选择商品
     openDialog() {
     openDialog() {
-      if(!this.screenForm.warehouse) {
-        return this.$errorMsg('请选择仓库');
-      }
       this.isShowDialog = true;
       this.isShowDialog = true;
       if(this.screenForm.warehouse) {
       if(this.screenForm.warehouse) {
         this.getGoodsList();
         this.getGoodsList();

+ 1 - 1
src/views/supply/apply/components/engin_detail.vue

@@ -30,7 +30,7 @@
         </el-col>
         </el-col>
         <el-col :span="8" class="item">
         <el-col :span="8" class="item">
           <div class="label">工程登录编码</div>
           <div class="label">工程登录编码</div>
-          <div class="value">{{detailData.enginOrderNo}}</div>
+          <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         </el-col>
         <el-col :span="8" class="item">
         <el-col :span="8" class="item">
           <div class="label">工程项目名称</div>
           <div class="label">工程项目名称</div>

+ 4 - 1
src/views/supply/apply/components/engin_examine.vue

@@ -30,7 +30,7 @@
         </el-col>
         </el-col>
         <el-col :span="8" class="item">
         <el-col :span="8" class="item">
           <div class="label">工程登录编码</div>
           <div class="label">工程登录编码</div>
-          <div class="value">{{detailData.enginOrderNo}}</div>
+          <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         </el-col>
         <el-col :span="8" class="item">
         <el-col :span="8" class="item">
           <div class="label">工程项目名称</div>
           <div class="label">工程项目名称</div>
@@ -244,6 +244,9 @@ export default {
       getEnginDetail({id: this.listItem.id}).then(res => {
       getEnginDetail({id: this.listItem.id}).then(res => {
         this.detailData = res.data;
         this.detailData = res.data;
 
 
+        res.data.orders.forEach(item => {
+          item.approvalNumber = item.invoiceNum;
+        });
         this.goodsList = res.data.orders;
         this.goodsList = res.data.orders;
       })
       })
     },
     },

+ 6 - 6
src/views/supply/apply/components/engin_form.vue

@@ -170,8 +170,8 @@
       <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="100px">
       <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="100px">
         <el-row :gutter="20">
         <el-row :gutter="20">
           <el-col :xs="12" :sm="12" :lg="6">
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item prop="loginNum" label="工程订单号">
-              <el-input v-model="screenForm.loginNum" placeholder="请输入工程订单号"></el-input>
+            <el-form-item prop="loginNum" label="工程登录编号">
+              <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
           <el-col :xs="12" :sm="12" :lg="6">
@@ -228,7 +228,7 @@
               {{scope.row.orderType | orderTypeFilter}}
               {{scope.row.orderType | orderTypeFilter}}
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column align="center" label="工程订单号" prop="enginOrderNo" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
@@ -244,11 +244,11 @@
               <el-input v-model="scope.row.invoiceNum" size="small"></el-input>
               <el-input v-model="scope.row.invoiceNum" size="small"></el-input>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column align="center" label="总库存数量" prop="stockAdequate" min-width="100" show-overflow-tooltip>
+          <!-- <el-table-column align="center" label="总库存数量" prop="stockAdequate" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               {{stockFilter(scope.row, 1)}}
               {{stockFilter(scope.row, 1)}}
             </template>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="center" label="对应库存数量" prop="stockCorrespond" min-width="110" show-overflow-tooltip>
           <el-table-column align="center" label="对应库存数量" prop="stockCorrespond" min-width="110" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               {{stockFilter(scope.row, 2)}}
               {{stockFilter(scope.row, 2)}}
@@ -492,7 +492,7 @@ export default {
       getEnginGoodsList({
       getEnginGoodsList({
         pageNum: this.currentPage,
         pageNum: this.currentPage,
         pageSize: 10,
         pageSize: 10,
-        enginOrderNo: this.screenForm.loginNum,
+        refEnginRecordNo: this.screenForm.loginNum,
         refProjectName: this.screenForm.enginName,
         refProjectName: this.screenForm.enginName,
         specification: this.screenForm.model,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',

+ 20 - 4
src/views/supply/engin/commerce_list.vue

@@ -143,20 +143,36 @@
             <el-table-column align="center" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="220" fixed="right">
             <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <el-popconfirm style="margin-right: 10px;" title="确定申请吗?" @onConfirm="handleSubmit(scope.row.parentId)" v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
+                <el-popconfirm 
+                  style="margin-right: 10px;" 
+                  title="确定申请吗?" 
+                  @onConfirm="handleSubmit(scope.row.parentId)" 
+                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
                   <el-button slot="reference" type="text">申请</el-button>
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
-                <el-popconfirm style="margin-right: 10px;" title="确定撤回吗?" @onConfirm="handleWithdraw(scope.row.parentId)" v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
+                <el-popconfirm 
+                  style="margin-right: 10px;" 
+                  title="确定撤回吗?" 
+                  @onConfirm="handleWithdraw(scope.row.parentId)" 
+                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
                   <el-button slot="reference" type="text">撤回</el-button>
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
-                <el-popconfirm style="margin-right: 10px;" title="确定弃审吗?" @onConfirm="handleAbandon(scope.row.parentId)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
+                <el-popconfirm
+                  style="margin-right: 10px;" 
+                  title="确定弃审吗?"
+                  @onConfirm="handleAbandon(scope.row.parentId)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
                 <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
                 <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
                 <el-button type="text" @click="toReturn(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles)">退订</el-button>
                 <el-button type="text" @click="toReturn(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles)">退订</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
-                <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="handleDelete(scope.row.parentId)" v-if="$checkBtnRole('del', $route.meta.roles)">
+                <el-popconfirm
+                  style="margin-left: 10px;" 
+                  title="确定删除吗?"
+                  @onConfirm="handleDelete(scope.row.parentId)" 
+                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
                   <el-button slot="reference" type="text">删除</el-button>
                   <el-button slot="reference" type="text">删除</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
               </template>
               </template>

+ 3 - 3
src/views/supply/engin/components/commerce_detail.vue

@@ -121,7 +121,7 @@
             <div class="label">关闭日期</div>
             <div class="label">关闭日期</div>
             <div class="value">{{detailData.closeTime}}</div>
             <div class="value">{{detailData.closeTime}}</div>
           </el-col>
           </el-col>
-          <el-col :span="24" class="item" v-if="isExamine">
+          <el-col :span="24" class="item">
             <div class="label">审批说明</div>
             <div class="label">审批说明</div>
             <div class="value">{{detailData.examineNote}}</div>
             <div class="value">{{detailData.examineNote}}</div>
           </el-col>
           </el-col>
@@ -195,7 +195,7 @@
 
 
     <div class="page-footer">
     <div class="page-footer">
       <div class="footer">
       <div class="footer">
-        <el-button type="danger" @click="closeData">关闭订单</el-button>
+        <el-button type="danger" @click="closeData" v-if="detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'">关闭订单</el-button>
         <el-button type="primary" @click="openDirectDialog">提前开票</el-button>
         <el-button type="primary" @click="openDirectDialog">提前开票</el-button>
         <el-button type="primary" @click="overData">直调完结</el-button>
         <el-button type="primary" @click="overData">直调完结</el-button>
         <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus">直调发货</el-button>
         <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus">直调发货</el-button>
@@ -449,7 +449,7 @@ export default {
       getOrderDetail({id: this.listItem.parentId}).then(res => {
       getOrderDetail({id: this.listItem.parentId}).then(res => {
         if(res.data.items) {
         if(res.data.items) {
           res.data.items.forEach(item => {
           res.data.items.forEach(item => {
-            item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
+            item.number = (item.qty*100 - item.retiredQty*100) / 100;
             item.sums1 = ['number', 'directTransferQty', 'qty', 'enginNum'];
             item.sums1 = ['number', 'directTransferQty', 'qty', 'enginNum'];
             item.sums2 = ['totalAmount', 'payAmount', 'price', 'payRebateAmount', 'discAmount'];
             item.sums2 = ['totalAmount', 'payAmount', 'price', 'payRebateAmount', 'discAmount'];
           })
           })

+ 40 - 12
src/views/supply/engin/components/commerce_examine.vue

@@ -118,7 +118,16 @@
     </div>
     </div>
 
 
     <div class="table" style="margin-top: 20px">
     <div class="table" style="margin-top: 20px">
-      <el-table :data="detailData.items" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
+      <el-table
+        :data="detailData.items"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+        max-height="400"
+        show-summary
+        :summary-method="$getSummaries">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
         <el-table-column align="center" label="引用记录" prop="useRefCount" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="引用记录" prop="useRefCount" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
@@ -128,25 +137,37 @@
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
+        <el-table-column align="right" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="数量" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
           <template slot-scope="scope">
-            {{ (scope.row.qty*100 - scope.row.directTransferQty*100 - scope.row.retiredQty*100) / 100 }}
+            {{ scope.row.totalAmount | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="使用返利金额" prop="payRebateAmount" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.payRebateAmount | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.discAmount | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.payAmount | numToFixed }}
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="使用返利金额" prop="payRebateAmount" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
         <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
           <template slot-scope="scope">
             {{ scope.row.isDirectTransfer ? '是' : '否' }}
             {{ scope.row.isDirectTransfer ? '是' : '否' }}
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="已发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="已发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>
       </el-table>
@@ -246,6 +267,13 @@ export default {
     // 获取详情
     // 获取详情
     getDetail() {
     getDetail() {
       getOrderDetail({id: this.listItem.parentId}).then(res => {
       getOrderDetail({id: this.listItem.parentId}).then(res => {
+        if(res.data.items) {
+          res.data.items.forEach(item => {
+            item.number = (item.qty*100 - item.retiredQty*100) / 100;
+            item.sums1 = ['number', 'directTransferQty', 'qty', 'enginNum', 'refundableQty', 'tdQty'];
+            item.sums2 = ['totalAmount', 'payAmount', 'price', 'payRebateAmount', 'discAmount'];
+          })
+        }
         this.detailData = res.data;
         this.detailData = res.data;
       })
       })
     },
     },

+ 1 - 1
src/views/supply/engin/components/commerce_return.vue

@@ -271,7 +271,7 @@ export default {
       getOrderDetail({id: this.listItem.parentId}).then(res => {
       getOrderDetail({id: this.listItem.parentId}).then(res => {
         if(res.data.items) {
         if(res.data.items) {
           res.data.items.forEach(item => {
           res.data.items.forEach(item => {
-            item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
+            item.number = (item.qty*100 - item.retiredQty*100) / 100;
             item.sums1 = ['number', 'directTransferQty', 'qty', 'enginNum', 'refundableQty', 'tdQty'];
             item.sums1 = ['number', 'directTransferQty', 'qty', 'enginNum', 'refundableQty', 'tdQty'];
             item.sums2 = ['totalAmount', 'payAmount', 'price', 'payRebateAmount', 'discAmount'];
             item.sums2 = ['totalAmount', 'payAmount', 'price', 'payRebateAmount', 'discAmount'];
           })
           })

+ 1 - 1
src/views/supply/engin/components/engin_detail.vue

@@ -107,7 +107,7 @@
       </el-table>
       </el-table>
     </div>
     </div>
 
 
-    <div v-if="isExamine">
+    <div>
       <div class="main-title">
       <div class="main-title">
         <div class="title">审批记录</div>
         <div class="title">审批记录</div>
       </div>
       </div>

+ 2 - 2
src/views/supply/engin/components/home_detail.vue

@@ -121,7 +121,7 @@
             <div class="label">关闭日期</div>
             <div class="label">关闭日期</div>
             <div class="value">{{detailData.closeTime}}</div>
             <div class="value">{{detailData.closeTime}}</div>
           </el-col>
           </el-col>
-          <el-col :span="24" class="item" v-if="isExamine">
+          <el-col :span="24" class="item">
             <div class="label">审批说明</div>
             <div class="label">审批说明</div>
             <div class="value">{{detailData.examineNote}}</div>
             <div class="value">{{detailData.examineNote}}</div>
           </el-col>
           </el-col>
@@ -195,7 +195,7 @@
 
 
     <div class="page-footer">
     <div class="page-footer">
       <div class="footer">
       <div class="footer">
-        <el-button type="danger" @click="closeData">关闭订单</el-button>
+        <el-button type="danger" @click="closeData" v-if="detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'">关闭订单</el-button>
         <el-button type="primary" @click="openDirectDialog">提前开票</el-button>
         <el-button type="primary" @click="openDirectDialog">提前开票</el-button>
         <el-button type="primary" @click="overData">直调完结</el-button>
         <el-button type="primary" @click="overData">直调完结</el-button>
         <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus">直调发货</el-button>
         <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus">直调发货</el-button>

+ 15 - 3
src/views/supply/engin/engin_list.vue

@@ -118,16 +118,28 @@
             </el-table-column>
             </el-table-column>
             <el-table-column align="center" label="操作" width="180" fixed="right">
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <el-popconfirm style="margin-right: 10px;" title="确定申请吗?" @onConfirm="handleSubmit(scope.row.enginInfoId)" v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
+                <el-popconfirm 
+                  style="margin-right: 10px;" 
+                  title="确定申请吗?" 
+                  @onConfirm="handleSubmit(scope.row.enginInfoId)" 
+                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
                   <el-button slot="reference" type="text">申请</el-button>
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
-                <el-popconfirm style="margin-right: 10px;" title="确定撤回吗?" @onConfirm="handleWithdraw(scope.row.enginInfoId)" v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
+                <el-popconfirm 
+                  style="margin-right: 10px;" 
+                  title="确定撤回吗?" 
+                  @onConfirm="handleWithdraw(scope.row.enginInfoId)" 
+                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
                   <el-button slot="reference" type="text">撤回</el-button>
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
                 <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
                 <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
-                <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="handleDelete(scope.row.enginInfoId)" v-if="$checkBtnRole('del', $route.meta.roles)">
+                <el-popconfirm 
+                  style="margin-left: 10px;" 
+                  title="确定删除吗?" 
+                  @onConfirm="handleDelete(scope.row.enginInfoId)" 
+                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
                   <el-button slot="reference" type="text">删除</el-button>
                   <el-button slot="reference" type="text">删除</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
               </template>
               </template>

+ 20 - 4
src/views/supply/engin/home_list.vue

@@ -143,20 +143,36 @@
             <el-table-column align="center" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="220" fixed="right">
             <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <el-popconfirm style="margin-right: 10px;" title="确定申请吗?" @onConfirm="handleSubmit(scope.row.parentId)" v-if="scope.row.examineStatus === 'SAVE'" >
+                <el-popconfirm 
+                  style="margin-right: 10px;" 
+                  title="确定申请吗?" 
+                  @onConfirm="handleSubmit(scope.row.parentId)" 
+                  v-if="scope.row.examineStatus === 'SAVE'" >
                   <el-button slot="reference" type="text">申请</el-button>
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
-                <el-popconfirm style="margin-right: 10px;" title="确定撤回吗?" @onConfirm="handleWithdraw(scope.row.parentId)" v-if="scope.row.examineStatus === 'WAIT'" >
+                <el-popconfirm 
+                  style="margin-right: 10px;" 
+                  title="确定撤回吗?" 
+                  @onConfirm="handleWithdraw(scope.row.parentId)" 
+                  v-if="scope.row.examineStatus === 'WAIT'" >
                   <el-button slot="reference" type="text">撤回</el-button>
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
-                <el-popconfirm style="margin-right: 10px;" title="确定弃审吗?" @onConfirm="handleAbandon(scope.row.parentId)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
+                <el-popconfirm 
+                  style="margin-right: 10px;" 
+                  title="确定弃审吗?" 
+                  @onConfirm="handleAbandon(scope.row.parentId)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">编辑</el-button>
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">编辑</el-button>
                 <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
                 <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
                 <el-button type="text" @click="toReturn(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus !== 'FAIL'">退订</el-button>
                 <el-button type="text" @click="toReturn(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus !== 'FAIL'">退订</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
-                <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="handleDelete(scope.row.parentId)" v-if="$checkBtnRole('del', $route.meta.roles)">
+                <el-popconfirm 
+                  style="margin-left: 10px;" 
+                  title="确定删除吗?" 
+                  @onConfirm="handleDelete(scope.row.parentId)" 
+                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
                   <el-button slot="reference" type="text">删除</el-button>
                   <el-button slot="reference" type="text">删除</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
               </template>
               </template>

+ 5 - 0
src/views/supply/sales/components/sales_detail.vue

@@ -54,6 +54,11 @@
           show-summary
           show-summary
           :summary-method="$getSummaries">
           :summary-method="$getSummaries">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
+          <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ (scope.row.orderType == 'TRADE' || scope.row.orderType == 'HOME') ? scope.row.enginOrderNo : scope.row.mainOrderId }}
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="金蝶出库单号" prop="kingBillNo" min-width="180" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="金蝶出库单号" prop="kingBillNo" min-width="180" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编号" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编号" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>