From 169ed2f9a382cd5c45ca472d70bcddfd91405cd4 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Mon, 18 Sep 2023 10:57:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=E7=89=A9=E6=96=99=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/basic/basicMaterial.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/option/basic/basicMaterial.js b/src/option/basic/basicMaterial.js
index 33f28a1a..2a1d908a 100644
--- a/src/option/basic/basicMaterial.js
+++ b/src/option/basic/basicMaterial.js
@@ -258,6 +258,24 @@ export default {
       prop: "remark",
       type: "input",
     },
+    {
+      label: "物料图片",
+      prop: "picture",
+      type: "upload",
+      dataType: 'string',
+      listType: 'picture-img',
+      // hide: true,
+      labelWidth:'150',
+      span:10,
+      multiple:false,
+      width:"200px",
+      align:'left',
+      action: '/blade-resource/oss/endpoint/put-file',
+      propsHttp: {
+        res: 'data',
+        url: 'link',
+      },
+    },
 
 
 

From ce1d313ec5633b67dcc6d48fd5df7caff2b16ff7 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 18 Sep 2023 11:07:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionStockArticleDetails.vue       | 112 +--
 .../warehouseWarehouseingAddReceipt.vue       | 815 ++++++++++--------
 vite.config.js                                |  13 +-
 3 files changed, 504 insertions(+), 436 deletions(-)

diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 4abe52c3..5d4461fd 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="margin-bottom: 1%">
+      <el-row v-if="!search" style="margin-bottom: 1%">
         <!-- 列表模块 -->
         <el-table
           ref="table"
@@ -111,7 +111,6 @@
         >
       </div>
       <el-row>
-
         <!-- 列表模块 -->
         <tablecmt
           :columnList="columnList"
@@ -192,7 +191,7 @@
             @size-change="sizeChange"
             @current-change="currentChange"
             :current-page="page.currentPage"
-            :page-sizes="[30, 50,80, 120]"
+            :page-sizes="[30, 50, 80, 120]"
             :page-size="page.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
             :total="page.total"
@@ -331,10 +330,7 @@
 </template>
 
 <script>
-
-import {
-  Search
-} from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue';
 
 import {
   getList,
@@ -447,7 +443,8 @@ export default {
           fixed: true,
           sortable: true,
           head: false,
-        }, {
+        },
+        {
           prop: 'orderCode',
           label: '订单自编号',
           type: 2,
@@ -726,11 +723,10 @@ export default {
     '$route.query.id': {
       handler(newVal, oldVal) {
         // console.log(newVal, oldVal);
-        if(!!this.$route.query.id){
+        if (!!this.$route.query.id) {
           this.onLoad(this.page);
           this.onLoadOwn(this.page);
         }
-
       },
       deep: true,
       immediate: true,
@@ -844,13 +840,22 @@ export default {
       this.onLoadOwn(this.page);
     },
     printTemplate() {
+      console.log('111 :>> ', 111);
+      const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
+      orderNodeList.forEach(orderNode => {
+        console.log('orderNode :>> ', orderNode);
+        // console.log('orderNode.innerHTML :>> ', orderNode.innerHTML);
+      });
+
       let LODOP = getLodop();
-      console.log("LODOP>>>>>",LODOP);
+      console.log('LODOP>>>>>', LODOP);
       // console.log("this.ids>>>>>",this.selectionList);
       // if (this.selectionList.length === 0){
       //   this.$message.warning("请选择至少一条数据");
       //   return;
       // }
+
+      // 注释
       getStockTemplate({ id: this.materialQRCode.id }).then(res => {
         console.log('返回的数据', res.data.data);
         let templateData = res.data.data;
@@ -858,7 +863,7 @@ export default {
         // console.log(templateData);
         LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
         LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
-        LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开
+        LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
         // // 设置打印整宽且不变形
         LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
         // // 设置打印后自动关闭
@@ -867,7 +872,6 @@ export default {
         LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
         // LODOP.PREVIEW(); //预览(预览打印无脚标)
         LODOP.PRINT(); //直接打印
-
       });
     },
     //提交物品数据
@@ -887,9 +891,9 @@ export default {
         // console.log("包含非数字字符");
         asm.materialId = this.formMaterial.materialCode;
       }
-      if(!!this.formMaterial.id){
+      if (!!this.formMaterial.id) {
         id.push(this.formMaterial.id);
-      }else{
+      } else {
         if (this.selectionList.length > 0) {
           this.selectionList.forEach(i => {
             id.push(i.id);
@@ -1101,12 +1105,14 @@ export default {
           });
       });
       getDictionaryBiz('order_package_grounding_status').then(res => {
-        this.$functions.checkcColumnList('orderPackageGroundingStatusName', this.columnList).checkarr =
-          res.data.data.map(item => {
-            item.value = item.dictKey;
-            item.label = item.dictValue;
-            return item;
-          });
+        this.$functions.checkcColumnList(
+          'orderPackageGroundingStatusName',
+          this.columnList
+        ).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey;
+          item.label = item.dictValue;
+          return item;
+        });
       });
       getDictionaryBiz('order_package_freeze_status').then(res => {
         this.$functions.checkcColumnList('orderPackageFreezeStatusName', this.columnList).checkarr =
@@ -1117,20 +1123,24 @@ export default {
           });
       });
       getDictionaryBiz('order_package_stockup_status').then(res => {
-        this.$functions.checkcColumnList('orderPackageStockupStatusName', this.columnList).checkarr =
-          res.data.data.map(item => {
-            item.value = item.dictKey;
-            item.label = item.dictValue;
-            return item;
-          });
+        this.$functions.checkcColumnList(
+          'orderPackageStockupStatusName',
+          this.columnList
+        ).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey;
+          item.label = item.dictValue;
+          return item;
+        });
       });
       getDictionaryBiz('order_package_reservation_status').then(res => {
-        this.$functions.checkcColumnList('orderPackageReservationStatusName', this.columnList).checkarr =
-          res.data.data.map(item => {
-            item.value = item.dictKey;
-            item.label = item.dictValue;
-            return item;
-          });
+        this.$functions.checkcColumnList(
+          'orderPackageReservationStatusName',
+          this.columnList
+        ).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey;
+          item.label = item.dictValue;
+          return item;
+        });
       });
     },
     searchHide() {
@@ -1252,17 +1262,17 @@ export default {
       this.materialBox = true;
       this.formMaterial.id = row.id;
     },
-    allhandleQRCode(){
-      console.log(this.selectionList)
-      if(this.selectionList.length==0){
-        this.$message.error({message:'请先选择包件'})
-        return
+    allhandleQRCode() {
+      console.log(this.selectionList);
+      if (this.selectionList.length == 0) {
+        this.$message.error({ message: '请先选择包件' });
+        return;
       }
-      let checkcode=[]
-      this.selectionList.map(item=>{
-        checkcode.push(item.id)
+      let checkcode = [];
+      this.selectionList.map(item => {
+        checkcode.push(item.id);
         // checkcode.push(item.orderPackageCode)
-      })
+      });
       // return
       let qr = {
         ids: checkcode.join(','),
@@ -1271,9 +1281,8 @@ export default {
       showOrderPackgeCode(qr).then(res => {
         // this.orderPackageCode = res.data
         console.log(res.data);
-        this.html=''
-        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-
+        this.html = '';
+        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
       });
 
       this.dialogVisible = true;
@@ -1290,9 +1299,8 @@ export default {
       showOrderPackgeCode(qr).then(res => {
         // this.orderPackageCode = res.data
         console.log(res.data);
-        this.html=''
-        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-
+        this.html = '';
+        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
       });
 
       this.dialogVisible = true;
@@ -1370,13 +1378,13 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      console.log("执行了查询零零零零");
+      console.log('执行了查询零零零零');
       this.query.ids = this.$route.query.id;
       getDetail(this.$route.query.id).then(res => {
-        console.log("返回的数据》》》》",res.data.data);
+        console.log('返回的数据》》》》', res.data.data);
         const data = res.data.data;
         // this.page.total = data.total;
-        this.data[0]= data;
+        this.data[0] = data;
 
         this.loading = false;
         this.selectionClear();
@@ -1414,7 +1422,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.plck{
+.plck {
   display: flex;
   align-items: center;
   justify-content: flex-end;
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index a966cbbe..da6e3669 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -1,16 +1,23 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row >
+      <el-row>
         <!-- 查询模块 -->
-        <el-form  :inline="true"  ref="form" :model="form" label-width="120px" :rules="rules" :disabled="view">
+        <el-form
+          :inline="true"
+          ref="form"
+          :model="form"
+          label-width="120px"
+          :rules="rules"
+          :disabled="view"
+        >
           <!-- 表单字段 -->
           <el-col :span="24">
             <el-form-item label="入库批次" prop="receiptBatch">
-              <el-input v-model="form.receiptBatch" placeholder="请输入入库批次"/>
+              <el-input v-model="form.receiptBatch" placeholder="请输入入库批次" />
             </el-form-item>
             <el-form-item label="入库时间" prop="receiptDate">
-<!--              <el-input v-model="form.receiptDate" placeholder="请输入入库时间"/>-->
+              <!--              <el-input v-model="form.receiptDate" placeholder="请输入入库时间"/>-->
               <el-date-picker
                 v-model="form.receiptDate"
                 placeholder="请选择入库时间"
@@ -22,7 +29,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="客户名称" prop="clientId">
-<!--              <el-input v-model="form.customerName" placeholder="请输入客户名称"/>-->
+              <!--              <el-input v-model="form.customerName" placeholder="请输入客户名称"/>-->
               <el-select
                 v-model="form.clientId"
                 filterable
@@ -42,16 +49,16 @@
                 />
               </el-select>
             </el-form-item>
-<!--            <el-form-item label="门店名称" prop="storeName">-->
-            <el-form-item label="门店名称" >
-<!--              <el-input v-model="form.storeName" placeholder="请输入门店名称"/>-->
+            <!--            <el-form-item label="门店名称" prop="storeName">-->
+            <el-form-item label="门店名称">
+              <!--              <el-input v-model="form.storeName" placeholder="请输入门店名称"/>-->
               <el-select
                 v-model="form.storeId"
                 filterable
                 allow-create
                 default-first-option
                 :reserve-keyword="false"
-                @change="getMen($event,1)"
+                @change="getMen($event, 1)"
                 placeholder="请输入门店名称"
               >
                 <el-option
@@ -64,25 +71,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-<!--            <el-form-item label="物流单号" prop="trainNumber">-->
-            <el-form-item label="物流单号" >
-              <el-input v-model="form.trainNumber" placeholder="请输入物流车次"/>
+            <!--            <el-form-item label="物流单号" prop="trainNumber">-->
+            <el-form-item label="物流单号">
+              <el-input v-model="form.trainNumber" placeholder="请输入物流车次" />
             </el-form-item>
 
-<!--            <el-form-item label="入库车牌" prop="licensePlate">-->
-            <el-form-item label="入库车牌" >
-              <el-input v-model="form.licensePlate" placeholder="请输入入库车牌"/>
+            <!--            <el-form-item label="入库车牌" prop="licensePlate">-->
+            <el-form-item label="入库车牌">
+              <el-input v-model="form.licensePlate" placeholder="请输入入库车牌" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="订单自编号" prop="orderNumber" >
-               <el-input v-model="form.orderNumber" placeholder="请输入订单自编号"  />
+            <el-form-item label="订单自编号" prop="orderNumber">
+              <el-input v-model="form.orderNumber" placeholder="请输入订单自编号" />
             </el-form-item>
             <!--            <el-form-item label="运单号" prop="waybillNumber ">-->
             <!--              <el-input v-model="form.waybillNumber " placeholder="请输入运单号"/>-->
             <!--            </el-form-item>-->
 
-            <el-form-item label="所在仓库" prop="warehouseId" >
+            <el-form-item label="所在仓库" prop="warehouseId">
               <!--              <el-input  placeholder="请输入所在仓库"/>-->
               <el-select
                 v-model="form.warehouseId"
@@ -91,7 +98,7 @@
                 reserve-keyword
                 remote-show-suffix
                 :remote-method="remoteWareHouse"
-                @change="getMen($event,2)"
+                @change="getMen($event, 2)"
                 placeholder="请输入所在仓库"
               >
                 <el-option
@@ -104,103 +111,163 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="服务类型" prop="serviceType" >
-<!--              <el-input v-model="form.serviceType" placeholder="请输入服务类型"/>-->
-              <el-radio-group v-model="form.serviceType" class="ml-4" v-for="(item,index) in distributionType">
-                <el-radio :label="item.dictKey" size="large" style="padding-right: 20px">{{item.dictValue}}</el-radio>
+            <el-form-item label="服务类型" prop="serviceType">
+              <!--              <el-input v-model="form.serviceType" placeholder="请输入服务类型"/>-->
+              <el-radio-group
+                v-model="form.serviceType"
+                class="ml-4"
+                v-for="(item, index) in distributionType"
+              >
+                <el-radio :label="item.dictKey" size="large" style="padding-right: 20px">{{
+                  item.dictValue
+                }}</el-radio>
               </el-radio-group>
-
             </el-form-item>
           </el-col>
-
         </el-form>
       </el-row>
-      <el-row >
-        <div class="avue-crud__header" >
+      <el-row>
+        <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" :disabled="view">新 增</el-button>
-<!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
+            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" :disabled="view"
+              >新 增</el-button
+            >
+            <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
           </div>
           <!-- 头部右侧按钮模块 -->
-<!--          <div class="avue-crud__right">-->
-<!--            <el-button icon="el-icon-refresh" @click="searchChange" circle :disabled="view"></el-button>-->
-<!--            <el-button icon="el-icon-search" @click="searchHide" circle :disabled="view"></el-button>-->
-<!--          </div>-->
+          <!--          <div class="avue-crud__right">-->
+          <!--            <el-button icon="el-icon-refresh" @click="searchChange" circle :disabled="view"></el-button>-->
+          <!--            <el-button icon="el-icon-search" @click="searchHide" circle :disabled="view"></el-button>-->
+          <!--          </div>-->
         </div>
       </el-row>
       <el-row>
         <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="data"
-                  :height="height"
-                  style="width: 100%"
-                  :border="option.border">
-          <el-table-column type="selection" v-if="option.selection" width="55" align="center" ></el-table-column>
-          <el-table-column type="expand" v-if="option.expand" align="center" ></el-table-column>
+        <el-table
+          ref="table"
+          v-loading="loading"
+          @selection-change="selectionChange"
+          :data="data"
+          :height="height"
+          style="width: 100%"
+          :border="option.border"
+        >
+          <el-table-column
+            type="selection"
+            v-if="option.selection"
+            width="55"
+            align="center"
+          ></el-table-column>
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
           <el-table-column v-if="option.index" label="序号" type="index" width="80" align="center">
           </el-table-column>
-          <template v-for="(item,index) in option.column">
+          <template v-for="(item, index) in option.column">
             <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index">
+            <el-table-column
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+            >
             </el-table-column>
           </template>
-          <el-table-column prop="menu" label="实际入库数量" :width="150" align="center" v-if="this.$route.query.type == '3'">
-            <template #="{row}">
+          <el-table-column
+            prop="menu"
+            label="实际入库数量"
+            :width="150"
+            align="center"
+            v-if="this.$route.query.type == '3'"
+          >
+            <template #="{ row }">
               <el-input v-model="row.actualReceipt"></el-input>
             </template>
           </el-table-column>
           <!-- 操作栏模块 -->
-          <el-table-column prop="menu" label="操作" :width="300" align="center" v-if="!view || this.$route.query.type != '3'">
-            <template #="{row}">
-<!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEditOwn(row)" :disabled = typeView>编辑</el-button>
-              <el-button type="primary" text icon="el-icon-delete" v-if="row.conditions == '1'" @click="rowDelOwn(row)" :disabled = typeView>删除</el-button>
-<!--              <el-button type="primary" text icon="el-icon-setting" @click="handleDrawer(row)">子表配置</el-button>-->
+          <el-table-column
+            prop="menu"
+            label="操作"
+            :width="300"
+            align="center"
+            v-if="!view || this.$route.query.type != '3'"
+          >
+            <template #="{ row }">
+              <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
+              <el-button
+                type="primary"
+                text
+                icon="el-icon-edit"
+                @click="handleEditOwn(row)"
+                :disabled="typeView"
+                >编辑</el-button
+              >
+              <el-button
+                type="primary"
+                text
+                icon="el-icon-delete"
+                v-if="row.conditions == '1'"
+                @click="rowDelOwn(row)"
+                :disabled="typeView"
+                >删除</el-button
+              >
+              <!--              <el-button type="primary" text icon="el-icon-setting" @click="handleDrawer(row)">子表配置</el-button>-->
             </template>
           </el-table-column>
         </el-table>
       </el-row>
-      <div style="line-height: 20px;text-align:center;padding-top: 10px" v-if="!typeView || this.$route.query.type == '3'">
-          <span class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit" :disabled="view && !this.$route.query.type == '3'">提 交</el-button>
-<!--            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>-->
-          </span>
+      <div
+        style="line-height: 20px; text-align: center; padding-top: 10px"
+        v-if="!typeView || this.$route.query.type == '3'"
+      >
+        <span class="dialog-footer">
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="handleSubmit"
+            :disabled="view && !this.$route.query.type == '3'"
+            >提 交</el-button
+          >
+          <!--            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>-->
+        </span>
       </div>
 
-<!--      <el-row>-->
-<!--        <div class="avue-crud__pagination" style="width:100%">-->
-<!--          &lt;!&ndash; 分页模块 &ndash;&gt;-->
-<!--          <el-pagination align="right"-->
-<!--                         background-->
-<!--                         @size-change="sizeChange"-->
-<!--                         @current-change="currentChange"-->
-<!--                         :current-page="page.currentPage"-->
-<!--                         :page-sizes="[30, 50,80, 120]"-->
-<!--                         :page-size="page.pageSize"-->
-<!--                         layout="total, sizes, prev, pager, next, jumper"-->
-<!--                         :total="page.total">-->
-<!--          </el-pagination>-->
-<!--        </div>-->
-<!--      </el-row>-->
+      <!--      <el-row>-->
+      <!--        <div class="avue-crud__pagination" style="width:100%">-->
+      <!--          &lt;!&ndash; 分页模块 &ndash;&gt;-->
+      <!--          <el-pagination align="right"-->
+      <!--                         background-->
+      <!--                         @size-change="sizeChange"-->
+      <!--                         @current-change="currentChange"-->
+      <!--                         :current-page="page.currentPage"-->
+      <!--                         :page-sizes="[30, 50,80, 120]"-->
+      <!--                         :page-size="page.pageSize"-->
+      <!--                         layout="total, sizes, prev, pager, next, jumper"-->
+      <!--                         :total="page.total">-->
+      <!--          </el-pagination>-->
+      <!--        </div>-->
+      <!--      </el-row>-->
       <!-- 表单模块 -->
-      <el-dialog :title="title"
-                 v-model="box"
-                 width="50%"
-                 :before-close="beforeClose"
-                 append-to-body>
-        <el-form :disabled="view" ref="formDetail" :model="formDetail" label-width="80px" :rules="rules">
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
+        <el-form
+          :disabled="view"
+          ref="formDetail"
+          :model="formDetail"
+          label-width="80px"
+          :rules="rules"
+        >
           <!-- 表单字段 -->
           <el-form-item label="SKU" prop="sku">
-            <el-input v-model="formDetail.sku" placeholder="请输入SKU"/>
+            <el-input v-model="formDetail.sku" placeholder="请输入SKU" />
           </el-form-item>
           <el-form-item label="物品名称" prop="productName">
-<!--            <el-input v-model="formDetail.productName" placeholder="请输入物品名称"/>-->
+            <!--            <el-input v-model="formDetail.productName" placeholder="请输入物品名称"/>-->
             <el-select
               v-model="formDetail.productName"
               filterable
@@ -208,7 +275,7 @@
               reserve-keyword
               remote-show-suffix
               :remote-method="remoteMethodStuffName"
-              @change="getMenDianName($event,1)"
+              @change="getMenDianName($event, 1)"
               placeholder="请输入物品名称"
             >
               <el-option
@@ -218,10 +285,9 @@
                 :value="item.value"
               />
             </el-select>
-
           </el-form-item>
           <el-form-item label="物品编码" prop="productCode">
-<!--            <el-input v-model="formDetail.productCode" placeholder="请输入物品编码"/>-->
+            <!--            <el-input v-model="formDetail.productCode" placeholder="请输入物品编码"/>-->
             <el-select
               v-model="formDetail.productCode"
               filterable
@@ -229,7 +295,7 @@
               reserve-keyword
               remote-show-suffix
               :remote-method="remoteMethodStuffCode"
-              @change="getMenDianName($event,2)"
+              @change="getMenDianName($event, 2)"
               placeholder="请输入物品编码"
             >
               <el-option
@@ -241,7 +307,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="物品单位" prop="productUnit">
-<!--            <el-input v-model="formDetail.productUnit" placeholder="请输入物品单位"/>-->
+            <!--            <el-input v-model="formDetail.productUnit" placeholder="请输入物品单位"/>-->
             <el-select
               v-model="formDetail.productUnit"
               filterable
@@ -259,13 +325,13 @@
             </el-select>
           </el-form-item>
           <el-form-item label="包装数量" prop="packagingNumber">
-            <el-input v-model="formDetail.packagingNumber" placeholder="请输入包装数量"/>
+            <el-input v-model="formDetail.packagingNumber" placeholder="请输入包装数量" />
           </el-form-item>
-          <el-form-item label="包装规格" >
-            <el-input v-model="formDetail.packagingSpecifications" placeholder="请输入包装规格"/>
+          <el-form-item label="包装规格">
+            <el-input v-model="formDetail.packagingSpecifications" placeholder="请输入包装规格" />
           </el-form-item>
           <el-form-item label="物资品牌" prop="actualReceipt">
-<!--            <el-input v-model="formDetail.actualReceipt" placeholder="请选择物资品牌"/>-->
+            <!--            <el-input v-model="formDetail.actualReceipt" placeholder="请选择物资品牌"/>-->
             <el-select
               v-model="formDetail.brandId"
               filterable
@@ -285,17 +351,26 @@
             </el-select>
           </el-form-item>
           <el-form-item label="入库数量" prop="createInventory">
-            <el-input v-model="formDetail.createInventory" placeholder="请输入创建入库数量"/>
+            <el-input v-model="formDetail.createInventory" placeholder="请输入创建入库数量" />
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input
+              type="textarea"
+              v-model="formDetail.createInventory"
+              placeholder="备注"
+            />
           </el-form-item>
 
-<!--          <el-form-item label="入库单ID" prop="warehousingEntryId">-->
-<!--            <el-input v-model="formDetail.warehousingEntryId" placeholder="请输入入库单ID"/>-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item label="入库单ID" prop="warehousingEntryId">-->
+          <!--            <el-input v-model="formDetail.warehousingEntryId" placeholder="请输入入库单ID"/>-->
+          <!--          </el-form-item>-->
         </el-form>
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleDetail">确定</el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleDetail"
+              >确定</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
@@ -305,23 +380,27 @@
 </template>
 
 <script>
-import { getDetail, add, update, remove,getWarehouseDetail} from "@/api/warehouse/warehouseWarehousingEntry";
-import option from "@/option/warehouse/warehouseWarehousingDetail";
-import {mapGetters} from "vuex";
+import {
+  getDetail,
+  add,
+  update,
+  remove,
+  getWarehouseDetail,
+} from '@/api/warehouse/warehouseWarehousingEntry';
+import option from '@/option/warehouse/warehouseWarehousingDetail';
+import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getListUser } from '@/api/distribution/distributionStockup';
 import { getListClient } from '@/api/basicdata/basicClient';
 import { getDept } from '@/api/system/dept';
 import { getListMaterial } from '@/api/basic/basicMaterial';
 import { getListCopy } from '@/api/basicdata/basicdataWarehouse';
-import { getListIdsName} from '@/api/basicdata/basicdataStoreBrand';
-import { getListName} from '@/api/basicdata/basicdataStoreBusiness';
-
-
+import { getListIdsName } from '@/api/basicdata/basicdataStoreBrand';
+import { getListName } from '@/api/basicdata/basicdataStoreBusiness';
 
 export default {
-    name: "warehouseWarehouseingAddReceipt",
-  data () {
+  name: 'warehouseWarehouseingAddReceipt',
+  data() {
     return {
       height: 0,
       distributionType: [],
@@ -350,7 +429,7 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {
@@ -363,13 +442,13 @@ export default {
       option: option,
       // 表单列表
       data: [],
-      store: [],//仓库
-      stuffName: [],//物品名称
-      stuffCode: [],//物品编码
-      stuff: [],//物品集合
-      brandList: [],//品牌集合
-      shop: [],//门店
-      options: [],//客户
+      store: [], //仓库
+      stuffName: [], //物品名称
+      stuffCode: [], //物品编码
+      stuff: [], //物品集合
+      brandList: [], //品牌集合
+      shop: [], //门店
+      options: [], //客户
       rules: {
         sku: [
           { required: true, message: '请输入SKU', trigger: 'blur' },
@@ -379,311 +458,284 @@ export default {
           { required: true, message: '请输入物品名称', trigger: 'blur' },
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
-        productCode: [
-          { required: true, message: '请输入物品编码', trigger: 'change' }
-        ],
+        productCode: [{ required: true, message: '请输入物品编码', trigger: 'change' }],
         packagingNumber: [
           { required: true, message: '请输入包装数量', trigger: 'change' },
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
-        packagingSpecifications: [
-          { required: true, message: '请输入包装规格', trigger: 'change' }
-        ],
-        createInventory: [
-          { required: true, message: '请输入入库数量', trigger: 'change' }
-        ],
-        productUnit: [
-          { required: true, message: '请选择物品单位', trigger: 'change' }
-        ],
-        brandId: [
-          { required: true, message: '请选择品牌', trigger: 'change' }
-        ],
-
+        packagingSpecifications: [{ required: true, message: '请输入包装规格', trigger: 'change' }],
+        createInventory: [{ required: true, message: '请输入入库数量', trigger: 'change' }],
+        productUnit: [{ required: true, message: '请选择物品单位', trigger: 'change' }],
+        brandId: [{ required: true, message: '请选择品牌', trigger: 'change' }],
 
-        receiptBatch: [
-          { required: true, message: '请填写入库批次', trigger: 'blur' }
-        ],
+        receiptBatch: [{ required: true, message: '请填写入库批次', trigger: 'blur' }],
         receiptDate: [
-          { type: 'date', required: true, message: '请选择入库时间', trigger: 'change' }
-        ],
-        clientId: [
-          { required: true, message: '请填写客户名称', trigger: 'blur' }
-        ],
-        storeId: [
-          { required: true, message: '请填写门店名称', trigger: 'blur' }
-        ],
-        trainNumber: [
-          { required: true, message: '请填写物流单号', trigger: 'blur' }
+          { type: 'date', required: true, message: '请选择入库时间', trigger: 'change' },
         ],
-        licensePlate: [
-          { required: true, message: '请填写入库车牌', trigger: 'change' }
-        ],
-        warehouseId: [
-          { required: true, message: '请选择所在仓库', trigger: 'blur' }
-        ],
-        serviceType: [
-          { required: true, message: '请选择服务类型', trigger: 'blur' }
-        ]
+        clientId: [{ required: true, message: '请填写客户名称', trigger: 'blur' }],
+        storeId: [{ required: true, message: '请填写门店名称', trigger: 'blur' }],
+        trainNumber: [{ required: true, message: '请填写物流单号', trigger: 'blur' }],
+        licensePlate: [{ required: true, message: '请填写入库车牌', trigger: 'change' }],
+        warehouseId: [{ required: true, message: '请选择所在仓库', trigger: 'blur' }],
+        serviceType: [{ required: true, message: '请选择服务类型', trigger: 'blur' }],
       },
-
-    }
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
   },
-  watch:{
+  watch: {
     '$route.query.id': {
       handler(newVal, oldVal) {
         console.log(newVal, oldVal);
-        console.log("$route.query.id",this.$route.query.type);
+        console.log('$route.query.id', this.$route.query.type);
         this.selectionClear();
         this.getOwnDeliver();
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
-
     //物品名称回显
-    async getBanerqd(row){
-      let a = this.brandList.find(i =>i.value== row);
-      console.log("aA",a);
+    async getBanerqd(row) {
+      let a = this.brandList.find(i => i.value == row);
+      console.log('aA', a);
       this.formDetail.brandName = a.label;
     },
 
     //查询详情信息
-   async getOwnDeliver(){
+    async getOwnDeliver() {
       let a = this.$route.query.id;
       let ty = this.$route.query.type;
-      if(!!a){
-
+      if (!!a) {
         this.loading = true;
-        this.stuffCode=[];
-        this.stuffName=[];
-        this.store=[];
+        this.stuffCode = [];
+        this.stuffName = [];
+        this.store = [];
 
-       let b = await getWarehouseDetail(a);
-        console.log("bbbb",b.data.data);
+        let b = await getWarehouseDetail(a);
+        console.log('bbbb', b.data.data);
         const da = b.data.data;
 
         this.options.push({
           label: da.customerName,
-          value: da.clientId
+          value: da.clientId,
         });
-        if(!!da.storeId && da.storeId != '-1'){
-          console.log("门店》》》》");
+        if (!!da.storeId && da.storeId != '-1') {
+          console.log('门店》》》》');
           this.shop.push({
             label: da.storeName,
-            value: da.storeId
-          })
+            value: da.storeId,
+          });
         }
 
-        if(this.store.length < 1){
+        if (this.store.length < 1) {
           this.store.push({
-            label: !!da.warehouse ? da.warehouse : null ,
-            value: !!da.warehouseId ? da.warehouseId : null
-          })
+            label: !!da.warehouse ? da.warehouse : null,
+            value: !!da.warehouseId ? da.warehouseId : null,
+          });
         }
         this.form = da;
         // console.log(">>>>>>",this.form.storeId);
-        if(!!this.form.storeId && parseInt(this.form.storeId) == -1){
-          console.log(">>>>>>",this.form.storeId);
+        if (!!this.form.storeId && parseInt(this.form.storeId) == -1) {
+          console.log('>>>>>>', this.form.storeId);
           this.form.storeId = null;
         }
         this.data = da.list;
         this.loading = false;
-        if(!!ty && ty == "2"){
+        if (!!ty && ty == '2') {
           this.view = false;
-        }else {
+        } else {
           this.typeView = true;
           this.view = true;
         }
-
-      }else{
+      } else {
         this.view = false;
         this.loading = false;
         this.typeView = false;
       }
     },
     //物品名称
-    async remoteMethodStuffName(query){
+    async remoteMethodStuffName(query) {
       if (query) {
         this.stuff = [];
         this.stuffName = [];
-        let cl = await getListMaterial(this.page.currentPage, this.page.pageSize,{name:query});
-        console.log("物品名称",cl.data.data.records);
+        let cl = await getListMaterial(this.page.currentPage, this.page.pageSize, { name: query });
+        console.log('物品名称', cl.data.data.records);
         cl.data.data.records.forEach(i => {
           let st = {
             label: i.name,
-            value: i.id
-          }
+            value: i.id,
+          };
           this.stuffName.push(st);
-
         });
         this.stuff = cl.data.data.records;
       } else {
-        this.stuffName = []
+        this.stuffName = [];
       }
     },
     //物品名称回显
-    async getMenDianName(row,ty){
+    async getMenDianName(row, ty) {
       // console.log("值阿德飒飒的",row);
       this.formDetail.materialId = row;
-      this.stuff.some( i =>{
-        if(ty == 1){
-          if(i.id == row){
-            console.log('111',i);
+      this.stuff.some(i => {
+        if (ty == 1) {
+          if (i.id == row) {
+            console.log('111', i);
             //名称
             this.formDetail.sku = i.sku;
             this.formDetail.productUnit = i.logpmUnit;
             this.formDetail.packagingNumber = i.packageNum;
-            if(!!i.extent){
-              this.formDetail.packagingSpecifications = i.extent+"长"+i.breadth+"宽"+i.altitude+"高";
+            if (!!i.extent) {
+              this.formDetail.packagingSpecifications =
+                i.extent + '长' + i.breadth + '宽' + i.altitude + '高';
             }
             let st = {
               label: i.productCode,
-              value: i.id
-            }
+              value: i.id,
+            };
             this.stuffCode.push(st);
             this.formDetail.productCode = i.id;
-            return ;
+            return;
           }
-        }else{
-          if(i.id == row){
+        } else {
+          if (i.id == row) {
             //编码
             this.formDetail.sku = i.sku;
             this.formDetail.productUnit = i.logpmUnit;
             this.formDetail.packagingNumber = i.packingSpecification;
-            if(!!i.extent){
-              this.formDetail.packagingSpecifications = i.extent+"长"+i.breadth+"宽"+i.altitude+"高";
+            if (!!i.extent) {
+              this.formDetail.packagingSpecifications =
+                i.extent + '长' + i.breadth + '宽' + i.altitude + '高';
             }
             let st = {
               label: i.name,
-              value: i.id
-            }
+              value: i.id,
+            };
             this.stuffName.push(st);
             this.formDetail.productName = i.id;
-            return ;
+            return;
           }
         }
       });
-
     },
     //物品编码
-    async remoteMethodStuffCode(query){
+    async remoteMethodStuffCode(query) {
       if (query) {
-        let cl = await getListMaterial(this.page.currentPage, this.page.pageSize,{productCode:query});
+        let cl = await getListMaterial(this.page.currentPage, this.page.pageSize, {
+          productCode: query,
+        });
         // console.log(">>>>",cl.data.data.records);
         cl.data.data.records.forEach(i => {
           let st = {
             label: i.productCode,
-            value: i.id
-          }
+            value: i.id,
+          };
           this.stuffCode.push(st);
         });
         this.stuff = cl.data.data.records;
       } else {
-        this.stuffCode = []
+        this.stuffCode = [];
       }
     },
     //查询品牌信息
-    async getBrandName(query){
+    async getBrandName(query) {
       if (query) {
-        console.log("客户ID",this.form.clientId);
-        if(!!this.form.clientId){
+        console.log('客户ID', this.form.clientId);
+        if (!!this.form.clientId) {
           let si = !!this.form.storeId ? this.form.storeId : this.form.clientId;
-          let cl = await getListIdsName(this.page.currentPage, this.page.pageSize,{ brandName: query,ids: si });
-          console.log(">>>>",cl.data.data);
+          let cl = await getListIdsName(this.page.currentPage, this.page.pageSize, {
+            brandName: query,
+            ids: si,
+          });
+          console.log('>>>>', cl.data.data);
           cl.data.data.forEach(i => {
             let st = {
               label: i.brandName,
-              value: i.id
-            }
+              value: i.id,
+            };
             this.brandList.push(st);
           });
-        }else{
-          this.$message.warning("请先填写客户信息，在选择品牌！！")
+        } else {
+          this.$message.warning('请先填写客户信息，在选择品牌！！');
         }
-
       } else {
-        this.brandList = []
+        this.brandList = [];
       }
     },
     //门店查询
-    async getMen(row,type){
-      if(type == 1){
-        this.shop.some(i =>{
-          if(i.value == row){
+    async getMen(row, type) {
+      if (type == 1) {
+        this.shop.some(i => {
+          if (i.value == row) {
             this.form.storeName = i.label;
-            return ;
+            return;
           }
-        })
-      }else if(type == 2) {
-        this.store.some(i =>{
-          if(i.value == row){
+        });
+      } else if (type == 2) {
+        this.store.some(i => {
+          if (i.value == row) {
             this.form.warehouse = i.label;
-            return ;
+            return;
           }
-        })
-
+        });
       }
-
-
-
     },
-      //门店查询
-    async getMenDian(row){
+    //门店查询
+    async getMenDian(row) {
       // console.log("值阿德飒飒的",row);
       let aa = '';
-      this.options.some(i =>{
+      this.options.some(i => {
         // console.log(">><><><<>",i);
-        if(i.value == row){
+        if (i.value == row) {
           this.form.customerName = i.label;
           //查询客户服务类型
-          aa=  i.value;
+          aa = i.value;
         }
-      })
-      let bu = await getListName(this.page.currentPage, this.page.pageSize,{ clientId: aa ,typeService: '3'});
+      });
+      let bu = await getListName(this.page.currentPage, this.page.pageSize, {
+        clientId: aa,
+        typeService: '3',
+      });
       // console.log("bububu",bu.data.data.records);
-      if(bu.data.data?.records.length > 0){
+      if (bu.data.data?.records.length > 0) {
         this.form.serviceType = bu.data.data.records[0].mold;
       }
-      let cl = await getListClient(this.page.currentPage, this.page.pageSize,{pid:row});
+      let cl = await getListClient(this.page.currentPage, this.page.pageSize, { pid: row });
       // console.log(">>>>",cl.data.data.records);
-      this.shop =[];
-      cl.data.data.records.forEach(i =>{
-        let st= {
+      this.shop = [];
+      cl.data.data.records.forEach(i => {
+        let st = {
           label: i.clientName,
-          value: i.id
-        }
+          value: i.id,
+        };
         this.shop.push(st);
       });
-
     },
-      //仓库查询
-   async remoteWareHouse(query){
+    //仓库查询
+    async remoteWareHouse(query) {
       if (query) {
         // this.loading = true;
-        let cl = await getListCopy(this.page.currentPage, this.page.pageSize,{name:query});
+        let cl = await getListCopy(this.page.currentPage, this.page.pageSize, { name: query });
         // console.log("仓库查询>>>>",cl.data.data.records);
         this.store = [];
-        cl.data.data.records.forEach(i =>{
-          let st= {
+        cl.data.data.records.forEach(i => {
+          let st = {
             label: i.name,
-            value: i.id
-          }
+            value: i.id,
+          };
           this.store.push(st);
         });
         // setTimeout(() => {
@@ -693,23 +745,25 @@ export default {
         //   })
         // }, 200)
       } else {
-        if(this.store.length === 0){
-          this.store = []
+        if (this.store.length === 0) {
+          this.store = [];
         }
       }
     },
     //客户查询
-   async remoteMethod(query){
+    async remoteMethod(query) {
       if (query) {
         // this.loading = true;
-        this.options =[];
-        let cl = await getListClient(this.page.currentPage, this.page.pageSize,{clientName:query});
-        console.log("客户信息1234>>>>",cl.data.data.records);
-        cl.data.data.records.forEach(i =>{
-          let st= {
+        this.options = [];
+        let cl = await getListClient(this.page.currentPage, this.page.pageSize, {
+          clientName: query,
+        });
+        console.log('客户信息1234>>>>', cl.data.data.records);
+        cl.data.data.records.forEach(i => {
+          let st = {
             label: i.clientName,
             value: i.id,
-          }
+          };
           this.options.push(st);
         });
         // setTimeout(() => {
@@ -719,65 +773,64 @@ export default {
         //   })
         // }, 200)
       } else {
-        this.options = []
+        this.options = [];
       }
     },
-    handleEditOwn (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEditOwn(row) {
+      this.title = '编辑';
+      this.box = true;
       this.formDetail = row;
     },
-      //数据回显
-    handleDetail () {
-      this.$refs.formDetail.validate(valid=>{
+    //数据回显
+    handleDetail() {
+      this.$refs.formDetail.validate(valid => {
         if (valid) {
           console.log(this.formDetail);
-          this.stuff.some( i =>{
+          this.stuff.some(i => {
             console.log(i);
-            if(i.id == this.formDetail.productName){
+            if (i.id == this.formDetail.productName) {
               this.formDetail.productName = i.name;
             }
-            if(i.id == this.formDetail.productCode){
+            if (i.id == this.formDetail.productCode) {
               this.formDetail.productCode = i.productCode;
             }
-          })
-          this.distributionUnit.some( p =>{
-            if(p.dictKey == this.formDetail.productUnit){
+          });
+          this.distributionUnit.some(p => {
+            if (p.dictKey == this.formDetail.productUnit) {
               this.formDetail.productUnit = p.dictValue;
-              return ;
+              return;
             }
-          })
-          if( this.data.length > 0 ){
-            if(!!this.formDetail.createInventory){
+          });
+          if (this.data.length > 0) {
+            if (!!this.formDetail.createInventory) {
               let s = false;
-              this.data.some(i =>{
-                if(i.productCode === this.formDetail.productCode){
+              this.data.some(i => {
+                if (i.productCode === this.formDetail.productCode) {
                   s = true;
-                  if(this.title != "编辑"){
-                    i.createInventory = parseInt(i.createInventory) + parseInt(this.formDetail.createInventory);
+                  if (this.title != '编辑') {
+                    i.createInventory =
+                      parseInt(i.createInventory) + parseInt(this.formDetail.createInventory);
                     i.actualReceipt = 0;
                   }
-
                 }
-              })
-              if(!s){
+              });
+              if (!s) {
                 this.formDetail.actualReceipt = 0;
-                this.data.push(this.formDetail)
+                this.data.push(this.formDetail);
               }
-            }else{
-              this.$message.warning("请填写入库数量");
+            } else {
+              this.$message.warning('请填写入库数量');
             }
-
-          }else{
+          } else {
             this.formDetail.actualReceipt = 0;
-            this.data.push(this.formDetail)
+            this.data.push(this.formDetail);
           }
           this.box = false;
           this.formDetail = {};
         }
       });
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 545);
       getDictionaryBiz('distribution_type').then(res => {
         // console.log("...",res.data.data);
@@ -790,38 +843,37 @@ export default {
         this.distributionUnit = res.data.data;
       });
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    handleSubmit () {
-      this.$refs.form.validate(valid=>{
+    handleSubmit() {
+      this.$refs.form.validate(valid => {
         if (valid) {
           if (!this.form.id) {
             // console.log("this.form111",this.form);
-            if(this.data.length > 0){
+            if (this.data.length > 0) {
               this.form.list = this.data;
               add(this.form).then(() => {
                 this.box = false;
                 this.onLoad(this.page);
                 this.$message({
-                  type: "success",
-                  message: "操作成功!"
+                  type: 'success',
+                  message: '操作成功!',
                 });
               });
               this.form = {};
               this.data = [];
-            }else{
-              this.$message.warning("请添加物资详情！！！");
+            } else {
+              this.$message.warning('请添加物资详情！！！');
             }
-
           } else {
             // console.log("修改！！！");
             // if(!this.form.orderNumber){
@@ -832,7 +884,7 @@ export default {
             //
             // }
             // console.log("this.form222",this.form);
-            if(!!this.form.totalInput && parseInt(this.form.totalInput) == '-1'){
+            if (!!this.form.totalInput && parseInt(this.form.totalInput) == '-1') {
               this.form.totalInput = null;
             }
             this.form.list = this.data;
@@ -840,32 +892,30 @@ export default {
               this.box = false;
               this.onLoad(this.page);
               this.$message({
-                type: "success",
-                message: "操作成功!"
+                type: 'success',
+                message: '操作成功!',
               });
               // this.form = {};
-            })
+            });
           }
-
         }
       });
-
     },
-    handleAdd () {
-      this.title = '新增'
+    handleAdd() {
+      this.title = '新增';
       // this.form = {}
       this.box = true;
       //查询物料
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
@@ -876,19 +926,19 @@ export default {
       this.warehouseWarehousingEntryId = row.id;
       this.drawer = true;
     },
-    handleDrawerClose(){
+    handleDrawerClose() {
       this.warehouseWarehousingEntryId = '';
       this.drawer = false;
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -897,25 +947,25 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDelOwn (row) {
-      console.log(">>>>",row);
-    let a = this.data.findIndex(i =>{
-       if(i.productCode === row.productCode){
+    rowDelOwn(row) {
+      console.log('>>>>', row);
+      let a = this.data.findIndex(i => {
+        if (i.productCode === row.productCode) {
           return true;
-       }
-     })
-      this.data.splice(a,1);
+        }
+      });
+      this.data.splice(a, 1);
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -923,43 +973,42 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       this.selectionList = list;
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
       this.form = {};
       this.data = [];
       this.options = [];
       // this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-     onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       // this.loading = true;
-       //查询仓库
-      this.getWareHoust(page, params = {});
+      //查询仓库
+      this.getWareHoust(page, (params = {}));
       //查询客户
       // this.getChile(page,params = {});
-
     },
-   /* async getChile(page, params = {}){
+    /* async getChile(page, params = {}){
      let cl = await getListClient(page.currentPage, page.pageSize,{clientName:});
       console.log(">>>>",cl.data.data);
 
@@ -971,28 +1020,28 @@ export default {
      * @param params
      * @returns {Promise<void>}
      */
-    async getWareHoust(page, params = {}){
+    async getWareHoust(page, params = {}) {
       let a = await getListUser();
       let b = await getDept(a.data.data.deptId);
       // console.log("aaa",a);
       // console.log("bbb",b);
       //查询全部仓库
       let sl = {};
-      if(b.data.data.deptCategory == "4"){
-        sl.department= b.data.data.id;
+      if (b.data.data.deptCategory == '4') {
+        sl.department = b.data.data.id;
       }
-      let li = await getListCopy(page.currentPage, page.pageSize,sl);
+      let li = await getListCopy(page.currentPage, page.pageSize, sl);
       // console.log("li>>>>",li.data.data);
       this.store = [];
-      li.data.data.records.forEach(i =>{
-        let st= {
+      li.data.data.records.forEach(i => {
+        let st = {
           label: i.name,
-          value: i.id
-        }
+          value: i.id,
+        };
         this.store.push(st);
       });
 
-  /*    if(b.data.data.deptCategory == "4"){
+      /*    if(b.data.data.deptCategory == "4"){
         //部门
         let li = await getListCopy(page.currentPage, page.pageSize,{department: b.data.data.id});
         console.log("li>>>>",li.data.data);
@@ -1019,7 +1068,21 @@ export default {
         });
       }*/
     },
-  }
+  },
 };
 </script>
 
+<style scoped lang="scss">
+.avue-crud :deep(.el-input__wrapper) {
+  // element-plus输入框高度为内容的高度
+  height: fit-content;
+  width: 300px;
+}
+
+.avue-crud {
+  :deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper) {
+    width: auto !important;
+    height: auto !important;
+  }
+}
+</style>
diff --git a/vite.config.js b/vite.config.js
index e599c932..07654d03 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -14,7 +14,8 @@ export default ({ mode, command }) => {
         '/api': {
           // target: 'http://192.168.10.126:8889',
           // target: 'http://192.168.10.123:8889',
-          target: 'http://192.168.10.75:8777',
+          // target: 'http://192.168.10.75:8777',
+          target: 'http://test.api.huitongys.com',
           // target: 'http://192.168.10.29:13000',
           //target: 'http://test3.javablade.com',
           changeOrigin: true,
@@ -38,16 +39,12 @@ export default ({ mode, command }) => {
         output: {
           // 分包
           manualChunks(id) {
-            if (id.includes("node_modules")) {
-              return id
-                .toString()
-                .split("node_modules/")[1]
-                .split("/")[0]
-                .toString();
+            if (id.includes('node_modules')) {
+              return id.toString().split('node_modules/')[1].split('/')[0].toString();
             }
           },
         },
       },
-    }
+    },
   });
 };

From 2b48a02f08630df0564e62ac1b4d7b35cad9ce1e Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Mon, 18 Sep 2023 15:55:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouseWarehouseingAddReceipt.vue       | 350 +++++++++---------
 1 file changed, 185 insertions(+), 165 deletions(-)

diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index da6e3669..c5785915 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -1,23 +1,16 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row>
+      <el-row >
         <!-- 查询模块 -->
-        <el-form
-          :inline="true"
-          ref="form"
-          :model="form"
-          label-width="120px"
-          :rules="rules"
-          :disabled="view"
-        >
+        <el-form  :inline="true"  ref="form" :model="form" label-width="120px" :rules="rules" :disabled="view">
           <!-- 表单字段 -->
           <el-col :span="24">
             <el-form-item label="入库批次" prop="receiptBatch">
-              <el-input v-model="form.receiptBatch" placeholder="请输入入库批次" />
+              <el-input v-model="form.receiptBatch" placeholder="请输入入库批次"/>
             </el-form-item>
             <el-form-item label="入库时间" prop="receiptDate">
-              <!--              <el-input v-model="form.receiptDate" placeholder="请输入入库时间"/>-->
+<!--              <el-input v-model="form.receiptDate" placeholder="请输入入库时间"/>-->
               <el-date-picker
                 v-model="form.receiptDate"
                 placeholder="请选择入库时间"
@@ -29,7 +22,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="客户名称" prop="clientId">
-              <!--              <el-input v-model="form.customerName" placeholder="请输入客户名称"/>-->
+<!--              <el-input v-model="form.customerName" placeholder="请输入客户名称"/>-->
               <el-select
                 v-model="form.clientId"
                 filterable
@@ -38,7 +31,7 @@
                 remote-show-suffix
                 :remote-method="remoteMethod"
                 :loading="loading"
-                @change="getMenDian($event)"
+                @change="getMenDian($event,1)"
                 placeholder="请输入客户名称"
               >
                 <el-option
@@ -49,16 +42,39 @@
                 />
               </el-select>
             </el-form-item>
+
+            <el-form-item label="客户编码" prop="clientCode">
+              <!--              <el-input v-model="form.customerName" placeholder="请输入客户名称"/>-->
+              <el-select
+                v-model="form.clientCode"
+                filterable
+                remote
+                reserve-keyword
+                remote-show-suffix
+                :remote-method="remoteCodeMethod"
+                :loading="loading"
+                @change="getMenDian($event,2)"
+                placeholder="请输入客户编码"
+              >
+                <el-option
+                  v-for="item in optionCodes"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+
             <!--            <el-form-item label="门店名称" prop="storeName">-->
-            <el-form-item label="门店名称">
-              <!--              <el-input v-model="form.storeName" placeholder="请输入门店名称"/>-->
+            <el-form-item label="门店名称" >
+<!--              <el-input v-model="form.storeName" placeholder="请输入门店名称"/>-->
               <el-select
                 v-model="form.storeId"
                 filterable
                 allow-create
                 default-first-option
                 :reserve-keyword="false"
-                @change="getMen($event, 1)"
+                @change="getMen($event,1)"
                 placeholder="请输入门店名称"
               >
                 <el-option
@@ -71,25 +87,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <!--            <el-form-item label="物流单号" prop="trainNumber">-->
-            <el-form-item label="物流单号">
-              <el-input v-model="form.trainNumber" placeholder="请输入物流车次" />
+<!--            <el-form-item label="物流单号" prop="trainNumber">-->
+            <el-form-item label="物流车次" >
+              <el-input v-model="form.trainNumber" placeholder="请输入物流车次"/>
             </el-form-item>
 
-            <!--            <el-form-item label="入库车牌" prop="licensePlate">-->
-            <el-form-item label="入库车牌">
-              <el-input v-model="form.licensePlate" placeholder="请输入入库车牌" />
+<!--            <el-form-item label="入库车牌" prop="licensePlate">-->
+            <el-form-item label="入库车牌" >
+              <el-input v-model="form.licensePlate" placeholder="请输入入库车牌"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="订单自编号" prop="orderNumber">
-              <el-input v-model="form.orderNumber" placeholder="请输入订单自编号" />
+            <el-form-item label="订单自编号" prop="orderNumber" >
+               <el-input v-model="form.orderNumber" placeholder="请输入订单自编号"  />
             </el-form-item>
             <!--            <el-form-item label="运单号" prop="waybillNumber ">-->
             <!--              <el-input v-model="form.waybillNumber " placeholder="请输入运单号"/>-->
             <!--            </el-form-item>-->
 
-            <el-form-item label="所在仓库" prop="warehouseId">
+            <el-form-item label="所在仓库" prop="warehouseId" >
               <!--              <el-input  placeholder="请输入所在仓库"/>-->
               <el-select
                 v-model="form.warehouseId"
@@ -98,7 +114,7 @@
                 reserve-keyword
                 remote-show-suffix
                 :remote-method="remoteWareHouse"
-                @change="getMen($event, 2)"
+                @change="getMen($event,2)"
                 placeholder="请输入所在仓库"
               >
                 <el-option
@@ -111,157 +127,97 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="服务类型" prop="serviceType">
-              <!--              <el-input v-model="form.serviceType" placeholder="请输入服务类型"/>-->
-              <el-radio-group
-                v-model="form.serviceType"
-                class="ml-4"
-                v-for="(item, index) in distributionType"
-              >
-                <el-radio :label="item.dictKey" size="large" style="padding-right: 20px">{{
-                  item.dictValue
-                }}</el-radio>
+            <el-form-item label="服务类型" prop="serviceType" >
+<!--              <el-input v-model="form.serviceType" placeholder="请输入服务类型"/>-->
+              <el-radio-group v-model="form.serviceType" class="ml-4" v-for="(item,index) in distributionType">
+                <el-radio :label="item.dictKey" size="large" style="padding-right: 20px">{{item.dictValue}}</el-radio>
               </el-radio-group>
+
             </el-form-item>
           </el-col>
+
         </el-form>
       </el-row>
-      <el-row>
-        <div class="avue-crud__header">
+      <el-row >
+        <div class="avue-crud__header" >
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" :disabled="view"
-              >新 增</el-button
-            >
-            <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
+            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" :disabled="view">新 增</el-button>
+<!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
           </div>
           <!-- 头部右侧按钮模块 -->
-          <!--          <div class="avue-crud__right">-->
-          <!--            <el-button icon="el-icon-refresh" @click="searchChange" circle :disabled="view"></el-button>-->
-          <!--            <el-button icon="el-icon-search" @click="searchHide" circle :disabled="view"></el-button>-->
-          <!--          </div>-->
+<!--          <div class="avue-crud__right">-->
+<!--            <el-button icon="el-icon-refresh" @click="searchChange" circle :disabled="view"></el-button>-->
+<!--            <el-button icon="el-icon-search" @click="searchHide" circle :disabled="view"></el-button>-->
+<!--          </div>-->
         </div>
       </el-row>
       <el-row>
         <!-- 列表模块 -->
-        <el-table
-          ref="table"
-          v-loading="loading"
-          @selection-change="selectionChange"
-          :data="data"
-          :height="height"
-          style="width: 100%"
-          :border="option.border"
-        >
-          <el-table-column
-            type="selection"
-            v-if="option.selection"
-            width="55"
-            align="center"
-          ></el-table-column>
-          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  :height="height"
+                  style="width: 100%"
+                  :border="option.border">
+          <el-table-column type="selection" v-if="option.selection" width="55" align="center" ></el-table-column>
+          <el-table-column type="expand" v-if="option.expand" align="center" ></el-table-column>
           <el-table-column v-if="option.index" label="序号" type="index" width="80" align="center">
           </el-table-column>
-          <template v-for="(item, index) in option.column">
+          <template v-for="(item,index) in option.column">
             <!-- table字段 -->
-            <el-table-column
-              v-if="item.hide !== true"
-              :prop="item.prop"
-              :label="item.label"
-              :width="item.width"
-              :key="index"
-            >
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
             </el-table-column>
           </template>
-          <el-table-column
-            prop="menu"
-            label="实际入库数量"
-            :width="150"
-            align="center"
-            v-if="this.$route.query.type == '3'"
-          >
-            <template #="{ row }">
+          <el-table-column prop="menu" label="实际入库数量" :width="150" align="center" v-if="this.$route.query.type == '3'">
+            <template #="{row}">
               <el-input v-model="row.actualReceipt"></el-input>
             </template>
           </el-table-column>
           <!-- 操作栏模块 -->
-          <el-table-column
-            prop="menu"
-            label="操作"
-            :width="300"
-            align="center"
-            v-if="!view || this.$route.query.type != '3'"
-          >
-            <template #="{ row }">
-              <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
-              <el-button
-                type="primary"
-                text
-                icon="el-icon-edit"
-                @click="handleEditOwn(row)"
-                :disabled="typeView"
-                >编辑</el-button
-              >
-              <el-button
-                type="primary"
-                text
-                icon="el-icon-delete"
-                v-if="row.conditions == '1'"
-                @click="rowDelOwn(row)"
-                :disabled="typeView"
-                >删除</el-button
-              >
-              <!--              <el-button type="primary" text icon="el-icon-setting" @click="handleDrawer(row)">子表配置</el-button>-->
+          <el-table-column prop="menu" label="操作" :width="300" align="center" v-if="!view || this.$route.query.type != '3'">
+            <template #="{row}">
+<!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
+              <el-button type="primary" text icon="el-icon-edit" @click="handleEditOwn(row)" :disabled = typeView>编辑</el-button>
+              <el-button type="primary" text icon="el-icon-delete" v-if="row.conditions == '1'" @click="rowDelOwn(row)" :disabled = typeView>删除</el-button>
+<!--              <el-button type="primary" text icon="el-icon-setting" @click="handleDrawer(row)">子表配置</el-button>-->
             </template>
           </el-table-column>
         </el-table>
       </el-row>
-      <div
-        style="line-height: 20px; text-align: center; padding-top: 10px"
-        v-if="!typeView || this.$route.query.type == '3'"
-      >
-        <span class="dialog-footer">
-          <el-button
-            type="primary"
-            icon="el-icon-circle-check"
-            @click="handleSubmit"
-            :disabled="view && !this.$route.query.type == '3'"
-            >提 交</el-button
-          >
-          <!--            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>-->
-        </span>
+      <div style="line-height: 20px;text-align:center;padding-top: 10px" v-if="!typeView || this.$route.query.type == '3'">
+          <span class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit" :disabled="view && !this.$route.query.type == '3'">提 交</el-button>
+<!--            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>-->
+          </span>
       </div>
 
-      <!--      <el-row>-->
-      <!--        <div class="avue-crud__pagination" style="width:100%">-->
-      <!--          &lt;!&ndash; 分页模块 &ndash;&gt;-->
-      <!--          <el-pagination align="right"-->
-      <!--                         background-->
-      <!--                         @size-change="sizeChange"-->
-      <!--                         @current-change="currentChange"-->
-      <!--                         :current-page="page.currentPage"-->
-      <!--                         :page-sizes="[30, 50,80, 120]"-->
-      <!--                         :page-size="page.pageSize"-->
-      <!--                         layout="total, sizes, prev, pager, next, jumper"-->
-      <!--                         :total="page.total">-->
-      <!--          </el-pagination>-->
-      <!--        </div>-->
-      <!--      </el-row>-->
+<!--      <el-row>-->
+<!--        <div class="avue-crud__pagination" style="width:100%">-->
+<!--          &lt;!&ndash; 分页模块 &ndash;&gt;-->
+<!--          <el-pagination align="right"-->
+<!--                         background-->
+<!--                         @size-change="sizeChange"-->
+<!--                         @current-change="currentChange"-->
+<!--                         :current-page="page.currentPage"-->
+<!--                         :page-sizes="[30, 50,80, 120]"-->
+<!--                         :page-size="page.pageSize"-->
+<!--                         layout="total, sizes, prev, pager, next, jumper"-->
+<!--                         :total="page.total">-->
+<!--          </el-pagination>-->
+<!--        </div>-->
+<!--      </el-row>-->
       <!-- 表单模块 -->
-      <el-dialog
-        :title="title"
-        v-model="box"
-        width="50%"
-        :before-close="beforeClose"
-        append-to-body
-      >
-        <el-form
-          :disabled="view"
-          ref="formDetail"
-          :model="formDetail"
-          label-width="80px"
-          :rules="rules"
-        >
+      <el-dialog :title="title"
+                 v-model="box"
+                 width="50%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <el-form :disabled="view" ref="formDetail" :model="formDetail" label-width="80px" :rules="rules">
           <!-- 表单字段 -->
           <el-form-item label="SKU" prop="sku">
             <el-input v-model="formDetail.sku" placeholder="请输入SKU" />
@@ -330,8 +286,8 @@
           <el-form-item label="包装规格">
             <el-input v-model="formDetail.packagingSpecifications" placeholder="请输入包装规格" />
           </el-form-item>
-          <el-form-item label="物资品牌" prop="actualReceipt">
-            <!--            <el-input v-model="formDetail.actualReceipt" placeholder="请选择物资品牌"/>-->
+          <el-form-item label="产品品牌" prop="actualReceipt">
+<!--            <el-input v-model="formDetail.actualReceipt" placeholder="请选择物资品牌"/>-->
             <el-select
               v-model="formDetail.brandId"
               filterable
@@ -340,7 +296,7 @@
               remote-show-suffix
               :remote-method="getBrandName"
               @change="getBanerqd($event)"
-              placeholder="请输入物资品牌"
+              placeholder="请输入产品品牌"
             >
               <el-option
                 v-for="item in brandList"
@@ -442,13 +398,14 @@ export default {
       option: option,
       // 表单列表
       data: [],
-      store: [], //仓库
-      stuffName: [], //物品名称
-      stuffCode: [], //物品编码
-      stuff: [], //物品集合
-      brandList: [], //品牌集合
-      shop: [], //门店
-      options: [], //客户
+      store: [],//仓库
+      stuffName: [],//物品名称
+      stuffCode: [],//物品编码
+      stuff: [],//物品集合
+      brandList: [],//品牌集合
+      shop: [],//门店
+      options: [],//客户
+      optionCodes: [],//客户编号
       rules: {
         sku: [
           { required: true, message: '请输入SKU', trigger: 'blur' },
@@ -494,9 +451,16 @@ export default {
         this.getOwnDeliver();
       },
       deep: true,
-      immediate: true,
+      immediate: true
     },
+    'form.clientId': {
+      handler(newVal) {
+        console.log("newVal>>>>>>>>>>>>>>>",newVal)
+        console.log("this.options>>>>>>>>>>>>>>>",this.options)
+      },
+}
   },
+
   computed: {
     ...mapGetters(['permission']),
     ids() {
@@ -533,6 +497,7 @@ export default {
           label: da.customerName,
           value: da.clientId,
         });
+
         if (!!da.storeId && da.storeId != '-1') {
           console.log('门店》》》》');
           this.shop.push({
@@ -692,10 +657,39 @@ export default {
           }
         });
       }
+
+
+
     },
-    //门店查询
-    async getMenDian(row) {
+      //门店查询
+    async getMenDian(row,num){
       // console.log("值阿德飒飒的",row);
+      if (num==1){
+        const obj = this.options.find(item => item.value === row);
+        console.log("obj>>>>>>>>>>>",obj);
+        this.optionCodes =[
+          {
+            key:obj.value,
+            value:obj.value,
+            label:obj.code,
+          }
+        ]
+        this.form.clientCode = obj.value;
+
+      } else {
+       const obj = this.optionCodes.find(item => item.value === row);
+        console.log("obj>>>>>>>>>>>",obj);
+        this.options =[
+          {
+            key:obj.value,
+            value:obj.value,
+            label:obj.code,
+          }
+        ]
+        this.form.clientId = obj.value;
+      }
+      this.form.serviceType =null;
+      console.log("");
       let aa = '';
       this.options.some(i => {
         // console.log(">><><><<>",i);
@@ -763,7 +757,8 @@ export default {
           let st = {
             label: i.clientName,
             value: i.id,
-          };
+            code: i.clientCode
+          }
           this.options.push(st);
         });
         // setTimeout(() => {
@@ -776,9 +771,34 @@ export default {
         this.options = [];
       }
     },
-    handleEditOwn(row) {
-      this.title = '编辑';
-      this.box = true;
+    //客户编号
+    async remoteCodeMethod(query){
+      if (query) {
+        // this.loading = true;
+        this.optionCodes =[];
+        let cl = await getListClient(this.page.currentPage, this.page.pageSize,{clientCode:query});
+        console.log("客户信息1234>>>>",cl.data.data.records);
+        cl.data.data.records.forEach(i =>{
+          let st= {
+            label: i.clientCode,
+            value: i.id,
+            code: i.clientName
+          }
+          this.optionCodes.push(st);
+        });
+        // setTimeout(() => {
+        //   this.loading = false
+        //   this.loading = this.list.filter((item) => {
+        //     return item.label.toLowerCase().includes(query.toLowerCase())
+        //   })
+        // }, 200)
+      } else {
+        this.optionCodes = []
+      }
+    },
+    handleEditOwn (row) {
+      this.title = '编辑'
+      this.box = true
       this.formDetail = row;
     },
     //数据回显