【新增】家用工程

src/views/basic_data/stock/stock_fee_list.vue

@@ -28,11 +28,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="订单类型" prop="orderType">
-              <el-select
-                v-model="screenForm.orderType"
-                clearable
-                filterable
-              >
+              <el-select v-model="screenForm.orderType" clearable filterable>
                 <el-option
                   v-for="item in orderType"
                   :key="item.value"
@@ -87,7 +83,7 @@
                 filterable
                 multiple
               >
-              <el-option
+                <el-option
                   v-for="(item, index) in warehouseList"
                   :key="index"
                   :label="item.name"
@@ -166,9 +162,9 @@
           highlight-current-row
           stripe
           show-summary
-            :summary-method="$getSummaries"
+          :summary-method="$getSummaries"
         >
-        <el-table-column
+          <el-table-column
             align="left"
             label="订单类型"
             prop="orderType"
@@ -176,9 +172,9 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{filterOderType(scope.row.orderType)}}
+              {{ filterOderType(scope.row.orderType) }}
             </template>
-        </el-table-column>
+          </el-table-column>
           <el-table-column
             align="left"
             label="订单号"
@@ -213,7 +209,8 @@
             prop="reservedId"
             min-width="150"
             show-overflow-tooltip
-          />  <el-table-column
+          />
+          <el-table-column
             align="left"
             label="发货单号"
             prop="invoiceId"
@@ -241,10 +238,10 @@
             min-width="150"
             show-overflow-tooltip
           >
-          <template slot-scope="scope">
-            {{filterExamineStatus(scope.row.salesExamineStatus)}}
-          </template>
-        </el-table-column>
+            <template slot-scope="scope">
+              {{ filterExamineStatus(scope.row.salesExamineStatus) }}
+            </template>
+          </el-table-column>
           <el-table-column
             align="left"
             label="出库审核时间"
@@ -300,7 +297,8 @@
             prop="qty"
             min-width="150"
             show-overflow-tooltip
-          /> <el-table-column
+          />
+          <el-table-column
             align="right"
             label="价税合计"
             prop="payAmount"
@@ -368,22 +366,22 @@ export default {
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
       screenForm: {
-        correspondId:[] ,
+        correspondId: [],
         customerName: "",
         customerNumber: "",
         endTime: "",
-        id:'',
+        id: "",
         invoiceEndTime: "",
         invoiceStartTime: "",
         mainOrderId: "",
         materialName: "",
         materialNumber: "",
-        orderNo: '',
+        orderNo: "",
         orderType: "",
         specification: "",
         startTime: "",
-        orderDate:[],
-        invoiceDate:[]
+        orderDate: [],
+        invoiceDate: [],
       },
       typeList: [],
       warehouseList: [],
@@ -439,59 +437,60 @@ export default {
           label: "调拨家用",
         },
       ],
-      examineStatus:[
+      examineStatus: [
         {
-          value:'SAVE',
-          label:'保存'
+          value: "SAVE",
+          label: "保存",
         },
         {
-          value:'WAIT',
-          label:'待审核'
+          value: "WAIT",
+          label: "待审核",
         },
         {
-          value:'OK',
-          label:'通过'
+          value: "OK",
+          label: "通过",
         },
         {
-          value:'FAIL',
-          label:'不通过'
-        },{
-          value:'CLOSE',
-          label:'关闭'
-        }
-      ]
+          value: "FAIL",
+          label: "不通过",
+        },
+        {
+          value: "CLOSE",
+          label: "关闭",
+        },
+      ],
     };
   },
 
   computed: {
     exParams() {
       return {
-        correspondId: this.screenForm.correspondId.join(','),
+        correspondId: this.screenForm.correspondId.join(","),
         customerName: this.screenForm.customerName,
         customerNumber: this.screenForm.customerNumber,
         endTime: this.screenForm.orderDate[1],
-        id:this.screenForm.id,
+        id: this.screenForm.id,
         invoiceEndTime: this.screenForm.invoiceDate[1],
         invoiceStartTime: this.screenForm.invoiceDate[0],
         mainOrderId: this.screenForm.mainOrderId,
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,
-        orderNo:this.screenForm.orderNo,
+        orderNo: this.screenForm.orderNo,
         orderType: this.screenForm.orderType,
         specification: this.screenForm.specification,
         startTime: this.screenForm.orderDate[0],
       };
     },
-    filterOderType(){
-      return (type)=>{
-       return this.orderType.find(e=>e.value===type).label
-      }
+    filterOderType() {
+      return (type) => {
+        return this.orderType.find((e) => e.value === type).label;
+      };
+    },
+    filterExamineStatus() {
+      return (status) => {
+        return this.examineStatus.find((e) => e.value === status).label;
+      };
     },
-    filterExamineStatus(){
-      return (status)=>{
-        return  this.examineStatus.find(e=>e.value===status).label
-      }
-    }
   },
 
   created() {
@@ -502,17 +501,17 @@ export default {
       const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        correspondId: this.screenForm.correspondId.join(','),
+        correspondId: this.screenForm.correspondId.join(","),
         customerName: this.screenForm.customerName,
         customerNumber: this.screenForm.customerNumber,
         endTime: this.screenForm.orderDate[1],
-        id:this.screenForm.id,
+        id: this.screenForm.id,
         invoiceEndTime: this.screenForm.invoiceDate[1],
         invoiceStartTime: this.screenForm.invoiceDate[0],
         mainOrderId: this.screenForm.mainOrderId,
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,
-        orderNo:this.screenForm.orderNo,
+        orderNo: this.screenForm.orderNo,
         orderType: this.screenForm.orderType,
         specification: this.screenForm.specification,
         startTime: this.screenForm.orderDate[0],

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -164,6 +164,9 @@
             min-width="160"
             show-overflow-tooltip
           />
+          <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
           <el-table-column
             align="center"
             label="单价"

src/views/supply/engin/components/home_examine.vue

@@ -220,6 +220,9 @@
         <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <!-- {{ (scope.row.qty*100 - scope.row.directTransferQty*100 - scope.row.retiredQty*100) / 100 }} -->

src/views/supply/engin/components/home_form.vue

@@ -217,6 +217,22 @@
             <div v-else>{{scope.row.specification}}</div>
           </template>
         </el-table-column>
+        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.realMaterialNumber" size="small" readonly @click.native="getRealMaterData(scope.$index)" ></el-input>
+          </template>
+        </el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+            <el-input v-model="scope.row.realMaterialOldNumber" size="small" readonly @click.native="getRealMaterData(scope.$index)"></el-input>
+          </template>
+            </el-table-column>
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip>
+              <template slot-scope="scope">
+            <el-input v-model="scope.row.realSpecification" size="small" readonly @click.native="getRealMaterData(scope.$index)" ></el-input>
+
+          </template>
+            </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>
           <template slot-scope="scope">
@@ -432,7 +448,8 @@
       <div class="tables">
         <div class="table">
           <el-table :data="leftGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="leftSelectionChange">
-            <el-table-column align="center" type="selection" width="55" :selectable='checkboxSelect'></el-table-column>
+            <el-table-column  align="center" type="selection" width="55" :selectable='checkboxSelect'></el-table-column>
+
             <el-table-column align="center" label="销售类型" prop="saleName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品编码" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品名称" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
@@ -460,7 +477,7 @@
         </div>
         <div class="table">
           <el-table :data="rightGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="rightSelectionChange">
-            <el-table-column align="center" type="selection" width="55"></el-table-column>
+            <el-table-column  align="center" type="selection" width="55"></el-table-column>
             <el-table-column align="center" label="产品编码" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品名称" prop="name" 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>
@@ -475,6 +492,71 @@
         <el-button type="primary" @click="submitAddGoods">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="添加产品" :visible.sync="isSetMaterial" width="80%">
+      <el-form ref="goodsScreenForm" :model="goodsScreenForm" size="small" label-position="left">
+        <el-row :gutter="20">
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="proNum">
+              <el-input v-model="goodsScreenForm.proNum" placeholder="请输入产品编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="proName">
+              <el-input v-model="goodsScreenForm.proName" placeholder="请输入产品名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="proModel">
+              <el-input v-model="goodsScreenForm.proModel" placeholder="请输入产品型号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="price1"  style="display: flex">
+              <el-input v-model="goodsScreenForm.price1" placeholder="请输入价格" style="width: 46%"></el-input>
+              <span> - </span>
+              <el-input v-model="goodsScreenForm.price2" placeholder="请输入价格" style="width: 46%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="24" class="tr">
+            <el-form-item label="">
+              <el-button size="small" @click="resetGoodsScreenForm">清空</el-button>
+              <el-button size="small" type="primary" @click="submitGoodsScreenForm">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div >
+          <el-table :data="leftGoodsList" element-loading-text="Loading" border fit stripe height="400" >
+            <el-table-column  align="center"  width="55" >
+              <template slot-scope="scope">
+                <el-radio v-model="currentRadio" :label="scope.row.id">{{''}}</el-radio>
+              </template>
+            </el-table-column>
+           <el-table-column align="center" label="销售类型" prop="saleName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品名称" prop="name" 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="batchPrice" min-width="80" show-overflow-tooltip></el-table-column>
+          </el-table>
+          <div class="pagination clearfix" style="margin-top: 10px">
+            <div class="fr">
+              <el-pagination
+                @current-change="handleTableCurrentChange"
+                :current-page="currentPage"
+                :page-size="10"
+                background
+                layout="prev, pager, next"
+                :total="listTotal">
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submitPushGoods">确 定</el-button>
+      </span>
+    </el-dialog>
 
   </div>
 </template>
@@ -483,6 +565,7 @@
 import { getOrderDetail, getHomeLoginList, getHomeLoginDetail, getWarehouseList, addHome, editHome, submitHome, checkStock, getRetailProductList } from "@/api/supply/engin";
 import { getDictList, getTypeList, getSalesmanList } from '@/api/common'
 import { findElem } from '@/utils/util'
+import ret from "bluebird/js/release/util";
 
 let that
 export default {
@@ -599,7 +682,10 @@ export default {
       isFirst: false,
       salesmanList: [],
       oldSaleType: '',
-      notInRefQueryGoodsList: ''
+      notInRefQueryGoodsList: '',
+      isSetMaterial:false,
+      currentId:'',
+      currentRadio:''
     }
   },
 
@@ -1026,6 +1112,7 @@ export default {
     // 关闭 弹窗
     closeDialog() {
       this.isShowGoodsDialog = false;
+      this.isSetMaterial = false
     },
 
     // 左侧列表选择
@@ -1092,7 +1179,32 @@ export default {
       this.leftGoodsList = [];
       this.rightGoodsList = [];
     },
-
+    getRealMaterData(id){
+      this.currentId = id
+      this.isSetMaterial = true
+      this.getGoodsList();
+    },
+    submitPushGoods(){
+//    realMaterialId
+// 实装金蝶物料id
+//        realMaterialName
+// 实装金蝶物料名称
+//        realMaterialNumber
+// 实装金蝶物料编码
+//        realMaterialOldNumber
+// 实装金蝶物料旧编码
+//        realSpecification
+// 实装规格型号
+      const currentData = this.leftGoodsList.find(e=>e.id===this.currentRadio)
+
+          this.$set(this.goodsList[this.currentId],'realMaterialId',currentData.materialId)
+          this.$set(this.goodsList[this.currentId],'realMaterialName',currentData.materialName)
+          this.$set(this.goodsList[this.currentId],'realMaterialNumber',currentData.materialNumber)
+          this.$set(this.goodsList[this.currentId],'realMaterialOldNumber',currentData.materialOldNumber)
+          this.$set(this.goodsList[this.currentId],'realSpecification',currentData.specification)
+          console.log(this.goodsList[this.currentId]);
+          this.isSetMaterial = false
+    },
     // 检查库存
     checkStock() {
       if(!this.warehouseValue) {

src/views/supply/engin/components/home_return.vue

@@ -166,6 +166,9 @@
         <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">