no message

src/views/supply/displace/components/displace_examine.vue

@@ -87,14 +87,14 @@
         <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="displaceQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="置换数量" prop="displaceQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="备注" prop="remark" 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>
     </div>
 
     <div class="main-title">
-      <div class="title">货品信息</div>
+      <div class="title">置换货品信息</div>
     </div>
 
     <div class="table" style="margin-top: 20px">
@@ -181,7 +181,6 @@
 
 <script>
 import {examineOrder, getDetail} from "@/api/supply/displace";
-import { getTypeList } from "@/api/common";
 
 export default {
   name: 'DisplaceExamine',

src/views/supply/displace/components/displace_form.vue

@@ -409,7 +409,7 @@ export default {
       dialogTable_dataList: [],
       dialogTable_listLoading: false, // 列表加载loading
       screenOriginForm: {
-        orderNo: 'EOH1543527751456137217'
+        orderNo: ''
       },
       screenForm: {
         type: '',
@@ -508,6 +508,7 @@ export default {
     openShareDetail() {
       this.isShowOriginDialog = true;
       if (this.mainForm.examineStatus && this.originGoodsList.length > 0) {
+        this.screenOriginForm.orderNo = this.mainForm.orderNo
         this.queryRefDetail()
       }
     },

src/views/supply/displace/components/displace_return.vue

@@ -3,143 +3,121 @@
     <el-page-header @back="goBack" content="退订"></el-page-header>
 
     <div class="main-title">
-      <div class="title">工程订单</div>
+      <div class="title">订单信息</div>
     </div>
 
     <div class="diy-table-1">
       <el-row>
         <el-col :span="8" class="item">
-          <div class="label">工程订单号</div>
-          <div class="value">{{detailData.enginOrderId}}</div>
+          <div class="label">置换单号</div>
+          <div class="value">{{detailData.displaceOrderId}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单日期</div>
-          <div class="value">{{detailData.orderDate}}</div>
+          <div class="value">{{ detailData.orderDate ? detailData.orderDate.split(" ")[0] : '' }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">单据状态</div>
-          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+          <div class="value">{{ $parent.findExamineStatus(detailData.examineStatus) }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">经销商编码</div>
-          <div class="value">{{detailData.customerId}}</div>
-        </el-col>
-        <el-col :span="16" class="item">
-          <div class="label">经销商名称</div>
-          <div class="value">{{detailData.customerName}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">工程信息编号</div>
-          <div class="value">{{detailData.refEnginRecordNo}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">工程项目名称</div>
-          <div class="value">{{detailData.refProjectName}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">工程登录类型</div>
-          <div class="value">{{detailData.refPromiseStatus}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">厂工程编码</div>
-          <div class="value">{{detailData.refFactoryNo}}</div>
+          <div class="label">原订单号</div>
+          <div class="value">{{detailData.orderNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">使用单位</div>
-          <div class="value">{{detailData.refUseUnit}}</div>
+          <div class="label">订单类型</div>
+          <div class="value">{{ $parent.findOrderType(detailData.orderType) }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">销售类型</div>
-          <div class="value">{{detailData.saleTypeName}}</div>
+          <div class="label">销售政策编号</div>
+          <div class="value">{{detailData.policyCode}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">联系人</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="label">销售政策</div>
+          <div class="value">{{detailData.policyTitle}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">固定电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="label">销售政策说明</div>
+          <div class="value">{{detailData.policyRemark}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">移动电话</div>
-          <div class="value">{{detailData.aaa}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">不扣押金</div>
-          <div class="value">{{detailData.takeDeposit ? '是':'否'}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">文件编码</div>
-          <div class="value">{{detailData.fileNo}}</div>
+          <div class="label">工程登录编码</div>
+          <div class="value">{{detailData.enginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">业务员</div>
           <div class="value">{{detailData.serviceName}}</div>
         </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">格力回复</div>
-          <div class="value">{{detailData.note1}}</div>
+        <el-col :span="8" class="item">
+          <div class="label">经销商编号</div>
+          <div class="value">{{detailData.customerId}}</div>
         </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">格力内部备注</div>
-          <div class="value">{{detailData.note2}}</div>
+        <el-col :span="8" class="item">
+          <div class="label">经销商名称</div>
+          <div class="value">{{detailData.customerName}}</div>
         </el-col>
-        <el-col :span="24" class="item">
+        <el-col :xs="24" :sm="24" :lg="24" class="item">
           <div class="label">备注</div>
           <div class="value">{{detailData.remark}}</div>
         </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">制单人</div>
+        <el-col :span="8" class="item">
+          <div class="label">申请人</div>
           <div class="value">{{detailData.createName}}</div>
         </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">制单日期</div>
-          <div class="value">{{detailData.createTime}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">关闭人</div>
-          <div class="value">{{detailData.closeName}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">关闭日期</div>
-          <div class="value">{{detailData.closeTime}}</div>
-        </el-col>
       </el-row>
     </div>
 
     <div class="main-title">
+      <div class="title">原订单货品信息</div>
+    </div>
+    <div class="table">
+      <el-table :data="detailData.originItems" element-loading-text="Loading" border fit highlight-current-row stripe>
+        <el-table-column align="center" label="序号" type="index" width="50"></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="materialNumber" 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="materialName" 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="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单价" prop="price" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="数量" prop="qty" min-width="160" show-overflow-tooltip></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="rebateAmount" min-width="100" 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="displaceQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="备注" prop="remark" 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>
+    </div>
+
+    <div class="main-title">
       <div class="title">货品信息</div>
     </div>
 
     <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-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="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品编码" prop="materialNumber" 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="materialOldNumber" 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="specification" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="baseUnitId" 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>
+        <el-table-column align="center" label="单位" prop="unit" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="单价" prop="price" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="数量" prop="qty" min-width="160" show-overflow-tooltip></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="rebateAmount" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" 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>
-          <template slot-scope="scope">
-            {{ scope.row.isDirectTransfer ? '是' : '否' }}
-          </template>
-        </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="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="退订数量" prop="tdQty" min-width="100" show-overflow-tooltip>
+        <el-table-column align="center" label="退订数量" prop="retiredQty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.tdQty" size="small"></el-input>
+            <el-input v-model="scope.row.retiredQty" size="small"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
@@ -180,7 +158,7 @@
 </template>
 
 <script>
-import { getOrderDetail, returnCom } from "@/api/supply/engin";
+import { getDetail, returnOrder } from "@/api/supply/displace";
 
 export default {
   name: 'CommerceReturn',
@@ -251,8 +229,11 @@ export default {
 
     // 获取详情
     getDetail() {
-      getOrderDetail({id: this.listItem.parentId}).then(res => {
+      getDetail({ id: this.listItem.displaceOrderId }).then(res => {
         this.detailData = res.data;
+        this.detailData.items.forEach(item => {
+          item.retiredQty = 0
+        })
       })
     },
 
@@ -264,11 +245,11 @@ export default {
         type: 'warning'
       }).then(() => {
         let params = {
-          enginOrderId: this.detailData.enginOrderId,
+          displaceOrderId: this.detailData.displaceOrderId,
           items: this.detailData.items,
           refundNote: this.returnForm.remark
         };
-        returnCom(params).then(res => {
+        returnOrder(params).then(res => {
           this.$successMsg();
           this.goBack();
           this.$parent.getList();

src/views/supply/displace/displace_list.vue

@@ -139,7 +139,7 @@
     <DisplaceDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <DisplaceForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
     <DisplaceExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
-<!--    <DisplaceReturn :listItem="queryItem" v-if="isShowReturn" @backListFormDetail="backList" />-->
+    <DisplaceReturn :listItem="queryItem" v-if="isShowReturn" @backListFormDetail="backList" />
   </div>
 </template>
 

src/views/supply/engin/engin_list.vue

@@ -66,7 +66,7 @@
                 <el-input v-model="screenForm.examineMan" placeholder="请输入审核人"></el-input>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
@@ -141,7 +141,7 @@
         </div>
       </div>
     </div>
-    
+
     <EnginDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <EnginForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
     <EnginExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
@@ -333,7 +333,7 @@ export default {
 
     // 删除
     handleDelete(id) {
-      deleteEngin({id}).then(res => {
+      deleteEngin({ids: id}).then(res => {
         this.$successMsg();
         this.getList();
       })