销售退货功能修改

src/components/oqcSelect/single.vue

@@ -217,6 +217,11 @@
                 this.selectedRow = row;
             }
         },
+        handleCurrent(row){
+            if(row){
+                this.selectedRow = row;
+            }
+        },
         //确定选中
         confirmSelect(){
             if(this.selectedId ==null || this.selectedId==0){

src/views/mes/wm/productsalse/index.vue

@@ -100,10 +100,7 @@
       <el-table-column label="出货检验单" width="150px" align="center" prop="oqcCode" />
       <el-table-column label="销售订单编号" width="120px" align="center" prop="soCode" />
       <el-table-column label="客户编码" align="center" prop="clientCode" />
-      <el-table-column label="客户名称" align="center" prop="clientName" />
+      <el-table-column label="客户名称" align="center" prop="clientName" />   
-      <el-table-column label="仓库名称" align="center" prop="warehouseName" />
-      <el-table-column label="库区名称" align="center" prop="locationName" />
-      <el-table-column label="库位名称" align="center" prop="areaName" />
       <el-table-column label="出库日期" align="center" prop="salseDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.salseDate, '{y}-{m}-{d}') }}</span>
@@ -192,20 +189,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="客户名称" prop="clientName">
+            <el-form-item label="客户编码" prop="clientCode">
-              <el-input v-model="form.clientName" placeholder="请输入客户名称" />
+              <el-input v-model="form.clientCode" placeholder="请输入客户编码" >
+                <el-button slot="append" @click="handleSelectClient" icon="el-icon-search"></el-button>
+              </el-input>
+              <ClientSelect ref="clientSelect" @onSelected="onClientSelected" > </ClientSelect>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="出库仓库">
+            <el-form-item label="客户名称" prop="clientName">
-              <el-cascader v-model="warehouseInfo"
+              <el-input v-model="form.clientName" readonly="readonly"/>
-                :options="warehouseOptions"
-                :props="warehouseProps"
-                @change="handleWarehouseChanged"
-              >                  
-              </el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -256,12 +251,13 @@
 import { listProductsalse, getProductsalse, delProductsalse, addProductsalse, updateProductsalse,execute } from "@/api/mes/wm/productsalse";
 import Productsalseline from "./line.vue"
 import OqcSelectSingle from "@/components/oqcSelect/single.vue"
+import ClientSelect from "@/components/clientSelect/single.vue";
 import {getTreeList} from "@/api/mes/wm/warehouse"
 import {genCode} from "@/api/system/autocode/rule"
 export default {
   name: "Productsalse",
   dicts: ['mes_order_status'],
-  components: {OqcSelectSingle,Productsalseline},
+  components: {OqcSelectSingle,Productsalseline,ClientSelect},
   data() {
     return {
       //自动生成编码
@@ -327,6 +323,9 @@ export default {
         salseName: [
           { required: true, message: "出库单名称不能为空", trigger: "blur" }
         ],
+        clientCode: [
+          { required: true, message: "请指定客户", trigger: "blur" }
+        ]
       }
     };
   },
@@ -521,7 +520,17 @@ export default {
           this.form.clientNick = obj.clientNick;
         }
     },
-
+    handleSelectClient(){
+      this.$refs.clientSelect.showFlag = true;
+    },
+    //客户选择弹出框
+    onClientSelected(obj){
+        if(obj != undefined && obj != null){
+          this.form.clientId = obj.clientId;
+          this.form.clientCode = obj.clientCode;
+          this.form.clientName = obj.clientName;
+        }
+    },
     //自动生成编码
     handleAutoGenChange(autoGenFlag){
       if(autoGenFlag){

src/views/mes/wm/rtsalse/index.vue

@@ -240,6 +240,10 @@
           </el-col>
         </el-row>
       </el-form>
+      <el-divider v-if="form.rtId !=null" content-position="center">产品信息</el-divider> 
+      <el-card shadow="always" v-if="form.rtId !=null" class="box-card">
+        <Rtsalseline :rtId="form.rtId" :optType="optType"></Rtsalseline>
+      </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
         <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>        
@@ -251,6 +255,7 @@
 
 <script>
 import { listRtsalse, getRtsalse, delRtsalse, addRtsalse, updateRtsalse } from "@/api/mes/wm/rtsalse";
+import Rtsalseline from "./line.vue";
 import ClientSelectSingle from "@/components/clientSelect/single.vue"
 import {getTreeList} from "@/api/mes/wm/warehouse"
 import {genCode} from "@/api/system/autocode/rule"
@@ -258,7 +263,7 @@ export default {
   name: "Rtsalse",
   dicts: ['mes_order_status'],
   components: {
-    ClientSelectSingle
+    ClientSelectSingle,Rtsalseline
   },
   data() {
     return {

src/views/mes/wm/rtsalse/line.vue

@@ -1,149 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-row v-if="optType != 'view'" :gutter="10" class="mb8">
-      <el-form-item label="退货单ID" prop="rtId">
-        <el-input
-          v-model="queryParams.rtId"
-          placeholder="请输入退货单ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产品物料ID" prop="itemId">
-        <el-input
-          v-model="queryParams.itemId"
-          placeholder="请输入产品物料ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产品物料编码" prop="itemCode">
-        <el-input
-          v-model="queryParams.itemCode"
-          placeholder="请输入产品物料编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产品物料名称" prop="itemName">
-        <el-input
-          v-model="queryParams.itemName"
-          placeholder="请输入产品物料名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unitOfMeasure">
-        <el-input
-          v-model="queryParams.unitOfMeasure"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退货数量" prop="quantityRted">
-        <el-input
-          v-model="queryParams.quantityRted"
-          placeholder="请输入退货数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="批次号" prop="batchCode">
-        <el-input
-          v-model="queryParams.batchCode"
-          placeholder="请输入批次号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库ID" prop="warehouseId">
-        <el-input
-          v-model="queryParams.warehouseId"
-          placeholder="请输入仓库ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库编码" prop="warehouseCode">
-        <el-input
-          v-model="queryParams.warehouseCode"
-          placeholder="请输入仓库编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库名称" prop="warehouseName">
-        <el-input
-          v-model="queryParams.warehouseName"
-          placeholder="请输入仓库名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库区ID" prop="locationId">
-        <el-input
-          v-model="queryParams.locationId"
-          placeholder="请输入库区ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库区编码" prop="locationCode">
-        <el-input
-          v-model="queryParams.locationCode"
-          placeholder="请输入库区编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库区名称" prop="locationName">
-        <el-input
-          v-model="queryParams.locationName"
-          placeholder="请输入库区名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库位ID" prop="areaId">
-        <el-input
-          v-model="queryParams.areaId"
-          placeholder="请输入库位ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库位编码" prop="areaCode">
-        <el-input
-          v-model="queryParams.areaCode"
-          placeholder="请输入库位编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库位名称" prop="areaName">
-        <el-input
-          v-model="queryParams.areaName"
-          placeholder="请输入库位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="有效期" prop="expireDate">
-        <el-date-picker clearable
-          v-model="queryParams.expireDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择有效期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -151,20 +8,9 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['wm:rtsalseline:add']"
+          v-hasPermi="['mes:wm:rtsalse:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['wm:rtsalseline:edit']"
-        >修改</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -173,63 +19,44 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['wm:rtsalseline:remove']"
+          v-hasPermi="['mes:wm:rtsalse:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['wm:rtsalseline:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="rtsalselineList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center" />   
-      <el-table-column label="行ID" align="center" prop="lineId" />
+      <el-table-column label="产品编码" align="center" prop="itemCode" />
-      <el-table-column label="退货单ID" align="center" prop="rtId" />
+      <el-table-column label="产品名称" align="center" prop="itemName" />
-      <el-table-column label="产品物料ID" align="center" prop="itemId" />
-      <el-table-column label="产品物料编码" align="center" prop="itemCode" />
-      <el-table-column label="产品物料名称" align="center" prop="itemName" />
       <el-table-column label="规格型号" align="center" prop="specification" />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
       <el-table-column label="退货数量" align="center" prop="quantityRted" />
       <el-table-column label="批次号" align="center" prop="batchCode" />
-      <el-table-column label="仓库ID" align="center" prop="warehouseId" />
+      <el-table-column label="仓库" align="center" prop="warehouseName" />
-      <el-table-column label="仓库编码" align="center" prop="warehouseCode" />
+      <el-table-column label="库区" align="center" prop="locationName" />
-      <el-table-column label="仓库名称" align="center" prop="warehouseName" />
+      <el-table-column label="库位" align="center" prop="areaName" />
-      <el-table-column label="库区ID" align="center" prop="locationId" />
-      <el-table-column label="库区编码" align="center" prop="locationCode" />
-      <el-table-column label="库区名称" align="center" prop="locationName" />
-      <el-table-column label="库位ID" align="center" prop="areaId" />
-      <el-table-column label="库位编码" align="center" prop="areaCode" />
-      <el-table-column label="库位名称" align="center" prop="areaName" />
       <el-table-column label="有效期" align="center" prop="expireDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" v-if="optType != 'view'" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['wm:rtsalseline:edit']"
+            v-hasPermi="['mes:wm:rtsalse:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['wm:rtsalseline:remove']"
+            v-hasPermi="['mes:wm:rtsalse:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -244,70 +71,54 @@
     />
 
     <!-- 添加或修改产品销售退货行对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">    
-        <el-form-item label="退货单ID" prop="rtId">
+        <el-row>
-          <el-input v-model="form.rtId" placeholder="请输入退货单ID" />
+          <el-col :span="8">
-        </el-form-item>
+            <el-form-item label="产品编码" prop="itemCode">
-        <el-form-item label="产品物料ID" prop="itemId">
+              <el-input v-model="form.itemCode" placeholder="请输入产品物料编码" />
-          <el-input v-model="form.itemId" placeholder="请输入产品物料ID" />
+            </el-form-item>
-        </el-form-item>
+          </el-col>
-        <el-form-item label="产品物料编码" prop="itemCode">
+          <el-col :span="8">
-          <el-input v-model="form.itemCode" placeholder="请输入产品物料编码" />
+            <el-form-item label="产品名称" prop="itemName">
-        </el-form-item>
+              <el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
-        <el-form-item label="产品物料名称" prop="itemName">
+            </el-form-item>
-          <el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
+          </el-col>
-        </el-form-item>
+          <el-col :span="8">
-        <el-form-item label="规格型号" prop="specification">
+            <el-form-item label="单位" prop="unitOfMeasure">
-          <el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
+              <el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="单位" prop="unitOfMeasure">
+          </el-col>
-          <el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
+        </el-row>   
-        </el-form-item>
+        <el-row>
-        <el-form-item label="退货数量" prop="quantityRted">
+          <el-col :span="24">
-          <el-input v-model="form.quantityRted" placeholder="请输入退货数量" />
+            <el-form-item label="规格型号" prop="specification">
-        </el-form-item>
+              <el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
-        <el-form-item label="批次号" prop="batchCode">
+            </el-form-item>
-          <el-input v-model="form.batchCode" placeholder="请输入批次号" />
+          </el-col>
-        </el-form-item>
+        </el-row>
-        <el-form-item label="仓库ID" prop="warehouseId">
+        <el-row>
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
+          <el-col :span="8">
-        </el-form-item>
+            <el-form-item label="退货数量" prop="quantityRted">
-        <el-form-item label="仓库编码" prop="warehouseCode">
+              <el-input v-model="form.quantityRted" placeholder="请输入退货数量" />
-          <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+            </el-form-item>
-        </el-form-item>
+          </el-col>
-        <el-form-item label="仓库名称" prop="warehouseName">
+          <el-col :span="8">
-          <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
+            <el-form-item label="批次号" prop="batchCode">
-        </el-form-item>
+              <el-input v-model="form.batchCode" placeholder="请输入批次号" />
-        <el-form-item label="库区ID" prop="locationId">
+            </el-form-item>
-          <el-input v-model="form.locationId" placeholder="请输入库区ID" />
+          </el-col>
-        </el-form-item>
+          <el-col :span="8">
-        <el-form-item label="库区编码" prop="locationCode">
+            <el-form-item label="入库仓库">
-          <el-input v-model="form.locationCode" placeholder="请输入库区编码" />
+              <el-cascader v-model="warehouseInfo"
-        </el-form-item>
+                :options="warehouseOptions"
-        <el-form-item label="库区名称" prop="locationName">
+                :props="warehouseProps"
-          <el-input v-model="form.locationName" placeholder="请输入库区名称" />
+                @change="handleWarehouseChanged"
-        </el-form-item>
+              >                  
-        <el-form-item label="库位ID" prop="areaId">
+              </el-cascader>
-          <el-input v-model="form.areaId" placeholder="请输入库位ID" />
+            </el-form-item>
-        </el-form-item>
+          </el-col>
-        <el-form-item label="库位编码" prop="areaCode">
+        </el-row>
-          <el-input v-model="form.areaCode" placeholder="请输入库位编码" />
-        </el-form-item>
-        <el-form-item label="库位名称" prop="areaName">
-          <el-input v-model="form.areaName" placeholder="请输入库位名称" />
-        </el-form-item>
-        <el-form-item label="有效期" prop="expireDate">
-          <el-date-picker clearable
-            v-model="form.expireDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择有效期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -319,7 +130,7 @@
 
 <script>
 import { listRtsalseline, getRtsalseline, delRtsalseline, addRtsalseline, updateRtsalseline } from "@/api/mes/wm/rtsalseline";
-
+import {getTreeList} from "@/api/mes/wm/warehouse"
 export default {
   name: "Rtsalseline",
   props: {
@@ -328,6 +139,13 @@ export default {
   },
   data() {
     return {
+      warehouseInfo:[],
+      warehouseOptions:[],
+      warehouseProps:{
+        multiple: false,
+        value: 'pId',
+        label: 'pName',
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -374,7 +192,7 @@ export default {
       // 表单校验
       rules: {
         itemId: [
-          { required: true, message: "产品物料ID不能为空", trigger: "blur" }
+          { required: true, message: "产品不能为空", trigger: "blur" }
         ],
         quantityRted: [
           { required: true, message: "退货数量不能为空", trigger: "blur" }
@@ -384,6 +202,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getWarehouseList();
   },
   methods: {
     /** 查询产品销售退货行列表 */
@@ -395,6 +214,31 @@ export default {
         this.loading = false;
       });
     },
+    getWarehouseList(){
+      getTreeList().then( response =>{        
+        this.warehouseOptions = response.data;
+        this.warehouseOptions.map(w =>{
+          w.children.map(l =>{
+                  let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');                  
+                  l.children = JSON.parse(lstr);
+          });
+            
+          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');  
+          w.children =  JSON.parse(wstr); 
+
+        });
+        let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
+        this.warehouseOptions = JSON.parse(ostr);
+      });
+    },
+    //选择默认的仓库、库区、库位
+    handleWarehouseChanged(obj){      
+      if(obj !=null){
+        this.form.warehouseId = obj[0];
+        this.form.locationId = obj[1];
+        this.form.areaId = obj[2];
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;