From 7623cdb268e83de71799ad33305da71dea1898cb Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 5 Mar 2024 11:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicdata/basicClient.js              |  1 +
 src/api/basicdata/basicdataFreight.js         |  9 +++
 .../basicdata/brand/basicdataFreight.vue      | 79 ++++++++++++++++++-
 .../basicdata/brand/basicdataFreightFrom.vue  |  3 +-
 .../warehouseStock/warehouseStock.vue         |  2 +-
 5 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/src/api/basicdata/basicClient.js b/src/api/basicdata/basicClient.js
index d3d700aa..51ba4434 100644
--- a/src/api/basicdata/basicClient.js
+++ b/src/api/basicdata/basicClient.js
@@ -89,3 +89,4 @@ export const selectName = (current, size, params) => {
   })
 }
 
+
diff --git a/src/api/basicdata/basicdataFreight.js b/src/api/basicdata/basicdataFreight.js
index bf55461a..cb67d323 100644
--- a/src/api/basicdata/basicdataFreight.js
+++ b/src/api/basicdata/basicdataFreight.js
@@ -48,3 +48,12 @@ export const update = (row) => {
   })
 }
 
+
+// 查看用户名称
+export const $_QueryUserName = (params) => {
+  return request({
+    url: '/api/logpm-basicdata-zqb/basicdataClient/detail',
+    method: 'get',
+    params
+  })
+}
\ No newline at end of file
diff --git a/src/views/basicdata/brand/basicdataFreight.vue b/src/views/basicdata/brand/basicdataFreight.vue
index 943147c7..16b25579 100644
--- a/src/views/basicdata/brand/basicdataFreight.vue
+++ b/src/views/basicdata/brand/basicdataFreight.vue
@@ -28,7 +28,7 @@
           plain
           v-if="permission.basicdataFreight_add"
           @click="ownSave"
-          >新增
+          >新增 
         </el-button>
         <el-button
           type="danger"
@@ -51,11 +51,54 @@
       <!--                   @click="$refs.crud.rowAdd()">新增</el-button>-->
       <!--      </template>-->
     </avue-crud>
+    <el-dialog
+    v-model="Detailspop"
+    title="详情"
+    width="60%"
+  >
+  <el-form class="el_formInfo" :model="formInfo" label-width="300px" style="width:100%" disabled>
+<div class='el_box_1'> 
+  <el-form-item label="用户名称">
+      <el-input v-model="formInfo.clientName" />
+    </el-form-item>
+    <el-form-item label="品牌名称">
+      <el-input v-model="formInfo.clientName" />
+    </el-form-item>
+    <el-form-item label="一口价">
+      <el-input v-model="formInfo.clientName" />
+    </el-form-item>
+    <el-form-item label="品类">
+      <el-input v-model="formInfo.clientName" />
+    </el-form-item>
+
+</div>
+<div class='el_box_2'>
+  <el-form-item label="生效时间">
+      <el-input v-model="formInfo.clientName" />
+    </el-form-item>
+    <el-form-item label="截止时间">
+      <el-input v-model="formInfo.clientName" />
+    </el-form-item>
+
+    <el-form-item label="服务类型">
+      <el-input v-model="formInfo.clientName" />
+    </el-form-item>
+</div>
+  </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="Detailspop = false">关闭</el-button>
+        <!-- <el-button type="primary" @click="DetailspopFn">
+          确定
+        </el-button> -->
+      </div>
+    </template>
+  </el-dialog>
   </basic-container>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from '@/api/basicdata/basicdataFreight';
+import { getList, getDetail, add, update, remove,$_QueryUserName } from '@/api/basicdata/basicdataFreight';
 // import option from "@/option/basicdata/basicdataFreight";
 import { mapGetters } from 'vuex';
 import { exportBlob } from '@/api/common';
@@ -72,6 +115,8 @@ export default {
       query: {},
       search: {},
       loading: true,
+      Detailspop:true,
+      formInfo:{},//详情弹窗表格
       page: {
         pageSize: 30,
         currentPage: 1,
@@ -611,10 +656,32 @@ export default {
         });
       });
     },
+    // 查看按钮
     beforeOpen(done, type) {
+      this.Detailspop=true;//开启弹窗
+      console.log(this.form.id);
+      console.log('查看');
+      getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+          $_QueryUserName({
+            id:res.data.data.itemName
+
+          }).then(res=>{
+            this.formInfo.clientName = res.data.data.clientName
+            console.log(res,'客户名称');
+          })
+        });
+      return
       if (['edit', 'view'].includes(type)) {
         getDetail(this.form.id).then(res => {
           this.form = res.data.data;
+          $_QueryUserName({
+            id:res.data.data.itemName
+
+          }).then(res=>{
+            this.formInfo.clientName = res.data.data.clientName
+            console.log(res,'客户名称');
+          })
         });
       }
       done();
@@ -706,5 +773,11 @@ export default {
      margin-right:0
   }
 }
-
+.el_formInfo{
+  display:flex;
+  flex-direction: column;
+  .el_box_1,.el_box_2{
+    display:flex;
+  }
+}
 </style>
diff --git a/src/views/basicdata/brand/basicdataFreightFrom.vue b/src/views/basicdata/brand/basicdataFreightFrom.vue
index 27e40a81..8c90705c 100644
--- a/src/views/basicdata/brand/basicdataFreightFrom.vue
+++ b/src/views/basicdata/brand/basicdataFreightFrom.vue
@@ -469,7 +469,7 @@ export default {
             this.form.arterys = fei;
             this.form.clientIds = this.form.clientIds;
             this.form.brand = this.form.brand;
-
+            this.form.itemName  =  this.form.clientIds
             this.form.category = this.form.category ? this.form.category.flat().join(',') : null;
             console.log(this.DryWarehouseDistributionA, '干选择');
             console.log(this.DryWarehouseDistributionB, '仓选择');
@@ -478,6 +478,7 @@ export default {
             // this.form.details = this.DryWarehouseDistributionB;
             this.form.details = [].concat(...this.DryWarehouseDistributionA, ...this.DryWarehouseDistributionB, ...this.DryWarehouseDistributionC);
             console.log('提交的数据》》》', this.form);
+   
             add(this.form).then(() => {
               this.$store.commit('DEL_TAG_CURRENT'); //关闭当前页面
               this.$router.push('/basicdata/brand/basicdataFreight'); //添加成功跳转到列表
diff --git a/src/views/warehouse/warehouseStock/warehouseStock.vue b/src/views/warehouse/warehouseStock/warehouseStock.vue
index 5a30762f..b7ed049a 100644
--- a/src/views/warehouse/warehouseStock/warehouseStock.vue
+++ b/src/views/warehouse/warehouseStock/warehouseStock.vue
@@ -286,7 +286,7 @@ export default {
         {
           prop: 'operatorTime',
           label: '操作时间',
-          type: 6,
+          type: 4,
           values: '',
           width: '130',
           checkarr: [],