From 9db95aa8c4e45436151dcb948a384914f5c26c5a Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 4 Mar 2024 15:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=96=B0=E5=A2=9E=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aftersales/aftersalesWorkOrderAdd.vue      | 18 ++++++++++++++----
 .../basicdata/brand/basicZonePriceFrom.vue     | 17 +++++++++++++++--
 .../delivery/distributionStockArticle.vue      |  6 +++---
 .../distributionStockArticleDiscuss.vue        |  4 ++--
 .../distributionStockArticleMarket.vue         |  4 ++--
 .../delivery/distributionStockArticleSelf.vue  |  4 ++--
 6 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 14fd0ede..8b9db740 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -15,7 +15,7 @@
       ref="IndexForm"
       :rules="rules"
     >
-      <el-form-item label="异常类型" prop="workOrderType" class="el_inputTop">
+      <el-form-item label="异常类型" prop="workOrderType" class="el_inputTop ">
         <el-select
           v-model="Indexform.workOrderType"
           clearable
@@ -924,6 +924,9 @@ const abnormalChange = val => {
   // } else {
   //   Indexform.value.packageCode = null;
   // }
+  // 切换类型重置图片
+  Indexform.value['packList']=[]
+  console.log(Indexform.value);
 };
 
 // 发现节点事件
@@ -1050,6 +1053,8 @@ const AddPackage = () => {
     brandName: '',
     state: false,
     mallName: '',
+    secondary:'',
+    first:'',
   });
 };
 // 包件移除
@@ -1094,6 +1099,8 @@ const TopChange = val => {
       brandName: '',
       state: false,
       mallName: '',
+      secondary:'',
+      first:'',
     },
   ]; //重置包件信息
   Indexform.value = {}; //重置表单
@@ -1246,6 +1253,8 @@ const ConfirmForm = () => {
               waybillNumber: item.waybillNumber ? item.waybillNumber : null, //运单号
               orderCode: item.orderCode ? item.orderCode : null, //订单自编码
               brandName: item.brandName ? item.brandName : null, //品牌
+              first:item.first ? item.first : null, //一级品类
+              secondary:item.secondary ? item.secondary : null, //二级品类
             });
           }
         });
@@ -1779,7 +1788,7 @@ const isShowFormItem4 = computed(() => {
   border: 1px solid #ccc;
   .el-form-item {
     display: flex;
-    align-items: center;
+    align-items: flex-start;
     margin: 0;
     margin-bottom: 18px;
     flex: 1 0 30%;
@@ -1938,7 +1947,7 @@ const isShowFormItem4 = computed(() => {
   }
   .maxBox {
     display: flex;
-    align-items: center;
+    align-items: flex-start;
     width: 30%;
     margin-right: 16px;
     font-size: 14px;
@@ -2195,6 +2204,7 @@ const isShowFormItem4 = computed(() => {
 }
 :deep(.el_inputTop) {
   margin-bottom: 0 !important;
+  margin: 5px 0 !important; 
 }
 :deep(.el-form-item.is-required:not(.is-no-asterisk).asterisk-left > .el-form-item__label:before){
   color: #ff0000;
@@ -2211,6 +2221,6 @@ const isShowFormItem4 = computed(() => {
 
 }
 .el_btn_remove{
-  padding-top: 6px;
+  // padding-top: 6px;
 }
 </style>
diff --git a/src/views/basicdata/brand/basicZonePriceFrom.vue b/src/views/basicdata/brand/basicZonePriceFrom.vue
index b1b46b72..7c625e55 100644
--- a/src/views/basicdata/brand/basicZonePriceFrom.vue
+++ b/src/views/basicdata/brand/basicZonePriceFrom.vue
@@ -107,9 +107,9 @@
                     v-model="item.remark"
                     placeholder="请输入费用"
                     :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                    @change="$event, index"
+                    @change="textbox($event,index)"
                   />
-                  <el-select v-model="item.identification" placeholder="请选择单位"   style="width: 100px">
+                  <el-select clearable v-model="item.identification" @change="optunit($event,index)"  placeholder="请选择单位"   style="width: 100px">
                     <el-option
                       v-for="item in optionsunit"
                       :key="item.value"
@@ -162,6 +162,8 @@ export default {
   name: 'basicZonePriceFrom',
   data() {
     return {
+
+      UnitList:[],//单位列表
       optionsunit:[{
         label:'件',
         value:'1',
@@ -323,6 +325,12 @@ export default {
     textbox(e, index) {
       console.log('e,index', e, index);
       this.costList[index + 1] = e;
+      console.log(this.costList);
+    },
+    optunit(e,index){
+      this.UnitList[index + 1]= e
+      console.log(this.UnitList,'this.UnitList');
+      console.log(e,index);
     },
     handleCheckedCities(value) {
       if (value.length < 1) {
@@ -517,6 +525,11 @@ export default {
             this.form.provinceEnd = this.form.provinceEnd[0];
             this.form.brandList = this.form.brand.join(',');
             this.form.brand = this.form.brand[this.form.brand.length - 1];
+            this.form.identification = {};
+            this.UnitList.forEach((item, index) => {
+            const key = index;
+             this.form.identification[key] = item[Object.keys(item)[0]];
+            });
             console.log('提交的数据》》》', this.form);
             add(this.form).then(() => {
               this.box = false;
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index af981ca6..b836cdd0 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -43,9 +43,9 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler"
-              >创建异常</el-button
-            >
+            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler"
+              ></el-button
+            > -->
             <!-- <el-button type="danger" icon="el-icon-edit" @click="handleMoke" v-if="handler"
               >转预约单</el-button
             > -->
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 7e0b76a5..0c784b20 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -37,9 +37,9 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler"
+            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler"
               >创建异常</el-button
-            >
+            > -->
             <el-button type="danger" icon="Edit" @click="handleCallDelivery('3')" v-if="handler"
               >修改客户信息</el-button
             >
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 25812e20..4f534b4f 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -34,9 +34,9 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler"
+            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler"
               >创建异常</el-button
-            >
+            > -->
             <!-- <el-button type="danger" icon="el-icon-edit" @click="handleMoke" v-if="handler"
               >转预约单</el-button
             > -->
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 733dba0b..3e255bb2 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -35,9 +35,9 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler"
+            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler"
               >创建异常</el-button
-            >
+            > -->
             <el-button type="primary" icon="el-icon-plus" @click="handlebill" v-if="handler"
               >创建提货单</el-button
             >