From 5c091b99f21be5475b14a46a794098a7d4601296 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 29 Apr 2024 16:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aftersales/aftersalesWorkOrderAddTemp.vue | 186 ++++++++++++++----
 .../checkInventoryTask/createTask.vue         |   5 +-
 2 files changed, 156 insertions(+), 35 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderAddTemp.vue b/src/views/aftersales/aftersalesWorkOrderAddTemp.vue
index a6a89213..3c7f8158 100644
--- a/src/views/aftersales/aftersalesWorkOrderAddTemp.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAddTemp.vue
@@ -46,6 +46,7 @@
               v-model="form.discoveryNode"
               placeholder="请选择发现节点"
               style="width: 100%"
+              @change="DiscoveringNodesChange"
             >
               <el-option
                 v-for="item in Discoveringoptions"
@@ -151,14 +152,14 @@
         >
           <el-tab-pane label="基础信息" name="0">
             <div class="Basicinformation">
-              <el-form-item label="车次号" prop="trainNumber">
+              <el-form-item label="车次号" prop="trainNumber" v-if="displaySettings.trainNumber">
                 <el-select
                   v-model="form.trainNumber"
                   placeholder="请选择车次号"
                   style="width: 100%"
                 >
                   <el-option
-                    v-for="item in Discoveringoptions"
+                    v-for="item in Trainoptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -167,7 +168,11 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="配送时间" prop="deliveryTime">
+              <el-form-item
+                label="配送时间"
+                prop="deliveryTime"
+                v-if="displaySettings.deliveryTime"
+              >
                 <el-date-picker
                   v-model="form.deliveryTime"
                   style="width: 100%"
@@ -177,13 +182,28 @@
                   placeholder="请选择配送时间"
                 />
               </el-form-item>
-              <el-form-item label="配送司机" prop="deliveryDriver">
+
+              <el-form-item
+                label="配送司机"
+                prop="deliveryDriver"
+                v-if="displaySettings.deliveryDriver"
+              >
                 <el-input v-model="form.deliveryDriver" placeholder="请输配送司机" clearable />
               </el-form-item>
-              <el-form-item label="车辆线路" prop="vehicleRoute">
+
+              <el-form-item
+                label="车辆线路"
+                prop="vehicleRoute"
+                v-if="displaySettings.vehicleRoute"
+              >
                 <el-input v-model="form.vehicleRoute" placeholder="请输入车辆线路" clearable />
               </el-form-item>
-              <el-form-item label="发货时间" prop="deliverGoodsTime">
+
+              <el-form-item
+                label="发货时间"
+                prop="deliverGoodsTime"
+                v-if="displaySettings.deliverGoodsTime"
+              >
                 <el-date-picker
                   v-model="form.deliverGoodsTime"
                   style="width: 100%"
@@ -193,7 +213,12 @@
                   placeholder="请选择发货时间"
                 />
               </el-form-item>
-              <el-form-item label="入库时间" prop="warehousingTime">
+
+              <el-form-item
+                label="入库时间"
+                prop="warehousingTime"
+                v-if="displaySettings.warehousingTime"
+              >
                 <el-date-picker
                   v-model="form.warehousingTime"
                   style="width: 100%"
@@ -203,7 +228,12 @@
                   placeholder="请选择入库时间"
                 />
               </el-form-item>
-              <el-form-item label="发现时间" prop="discoveryTime">
+
+              <el-form-item
+                label="发现时间"
+                prop="discoveryTime"
+                v-if="displaySettings.discoveryTime"
+              >
                 <el-date-picker
                   v-model="form.discoveryTime"
                   style="width: 100%"
@@ -213,32 +243,59 @@
                   placeholder="请选择发现时间"
                 />
               </el-form-item>
-              <el-form-item label="运单商场" prop="waybillMall">
+              <!-- 初始必填 -->
+              <el-form-item label="运单商场" prop="waybillMall" v-if="displaySettings.waybillMall">
                 <el-input v-model="form.waybillMall" placeholder="请输入运单商场" clearable />
               </el-form-item>
-              <el-form-item label="合作模式" prop="typeServiceName">
-                <el-input v-model="form.typeServiceName" placeholder="合作模式(自动带出)" clearable />
+              <!-- 初始必填 -->
+              <el-form-item
+                label="合作模式"
+                prop="typeServiceName"
+                v-if="displaySettings.typeServiceName"
+              >
+                <el-input
+                  v-model="form.typeServiceName"
+                  placeholder="合作模式(自动带出)"
+                  clearable
+                />
               </el-form-item>
-
+              <!-- 初始必填 -->
               <div class="el_Basic">
-                <el-form-item label="处理方" prop="processor" class="el_Processing">
-                <el-select
-                  v-model="form.processor"
-                  placeholder="请选择处理方"
-                  style="width: 100%"
+                <el-form-item
+                  label="处理方"
+                  prop="processor"
+                  class="el_Processing"
+                  v-if="displaySettings.processor"
                 >
-                  <el-option
-                    v-for="item in Discoveringoptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
+                  <el-select
+                    v-model="form.processor"
+                    placeholder="请选择处理方"
+                    style="width: 100%"
+                  >
+                    <el-option
+                      v-for="item in Processingoptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                      multiple
+                      filterable
+                      clearable
+                    />
+                  </el-select>
+                </el-form-item>
+                <!-- 初始必填 -->
+                <el-form-item
+                  label="调查经过"
+                  prop="investigationPocess"
+                  class="el_Investigation"
+                  v-if="displaySettings.investigationPocess"
+                >
+                  <el-input
+                    v-model="form.investigationPocess"
+                    placeholder="请输调查经过"
                     clearable
                   />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="调查经过" prop="deliveryTime" class="el_Investigation">
-                <el-input v-model="form.investigationPocess" placeholder="请输调查经过" clearable />
-              </el-form-item>
+                </el-form-item>
               </div>
             </div>
           </el-tab-pane>
@@ -274,7 +331,7 @@
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive, computed } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import {
@@ -286,12 +343,15 @@ import {
   $_getAbnormalPackage,
   $_shippingInformation,
 } from '@/api/aftersales/aftersalesWorkOrder';
+import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
+import { deepClone } from '@/utils/util';
 const form = ref({
   TabactiveName: '0', //工单类型菜单
   activPackage: '0', //包件信息菜单
   Pageloading: false, //页面加载
   Packageloading: false, //包件加载
   historydialog: false, //历史包件弹窗
+  groundlineType: 0, //发现节点
   //   包件列表
   PackageList: [
     {
@@ -316,12 +376,27 @@ const ruleForm = reactive({
   first: [{ required: true, message: '请输入一级品', trigger: 'change' }],
   secondary: [{ required: true, message: '请输入二级品', trigger: 'change' }],
   brandName: [{ required: true, message: '请输入品牌', trigger: 'change' }],
+  trainNumber: [{ required: true, message: '请选择车次号', trigger: 'change' }],
+  deliveryTime: [{ required: true, message: '请输入配送时间', trigger: 'change' }],
+  deliveryDriver: [{ required: true, message: '请输入配送司机', trigger: 'change' }],
+  vehicleRoute: [{ required: true, message: '请输入车辆线路', trigger: 'change' }],
+  deliverGoodsTime: [{ required: true, message: '请输入发货时间', trigger: 'change' }],
+  warehousingTime: [{ required: true, message: '请选择入库时间', trigger: 'change' }],
+  discoveryTime: [{ required: true, message: '请选择发现时间', trigger: 'change' }],
+  waybillMall: [{ required: true, message: '请输入运单商场', trigger: 'change' }],
+  typeServiceName: [{ required: true, message: '请输入合作模式', trigger: 'change' }],
+  processor: [{ required: true, message: '请输入处理方', trigger: 'change' }],
+  investigationPocess: [{ required: true, message: '请输入调查经过', trigger: 'change' }],
 });
 const ruleFormRef = ref(); //表单示例
 // 异常类型
 const Exceptionoptions = ref([]);
 // 发现节点
 const Discoveringoptions = ref([]);
+// 处理方
+const Processingoptions = ref([]);
+// 车次号
+const Trainoptions = ref([]);
 // 字典公共函数
 async function updateDictionary(targetArray, dictionaryType) {
   await getDictionaryBiz(dictionaryType).then(res => {
@@ -333,18 +408,61 @@ async function updateDictionary(targetArray, dictionaryType) {
     });
   });
 }
+// 获取处理方和责任方
+const Handling = () => {
+  getDeptWarehouse().then(res => {
+    let data = [];
+    if (res.data.code == 200) {
+      if (res.data && res.data.data.length) {
+        res.data.data.forEach(item => {
+          data.push({
+            value: item.id,
+            label: item.name,
+          });
+        });
+      }
+      Processingoptions.value = deepClone(data);
+    }
+  });
+};
+
 // 页面必要初始化请求
 const onLoad = async () => {
   form.value.Pageloading = true; //开启页面加载
   await updateDictionary(Exceptionoptions.value, 'pc_work_order'); //异常类型
   await updateDictionary(Discoveringoptions.value, 'pc_discovery_node'); //发现环节
+  await Handling(); //获取处理方和责任方
   form.value.Pageloading = false; //关闭页面加载
 };
 onLoad();
+
 // 菜单切换
 const handleClick = (tab, event) => {
   console.log(tab, event);
 };
+// 发现节点事件
+const DiscoveringNodesChange = value => {
+  console.log(value);
+  form.value.groundlineType = value;
+};
+// 菜单切换显示输入框
+const displaySettings = computed(() => {
+  const groundType = form.value.groundlineType;
+  const includesType = types => types.includes(groundType);
+  return {
+    trainNumber: includesType([3, 5, 7, 6]), // 车次号
+    deliveryTime: includesType([5, 7, 6]), // 配送时间
+    deliveryDriver: includesType([5, 7, 6]), // 配送司机
+    vehicleRoute: includesType([3]), // 车辆线路
+    deliverGoodsTime: includesType([2]), // 发货时间
+    warehousingTime: includesType([4]), // 入库时间
+    discoveryTime: includesType([4, 5, 6, 7]), // 发现时间
+    waybillMall: true, // 运单商场
+    typeServiceName: true, // 合作模式
+    processor: true, // 处理方
+    investigationPocess: true, // 调查经过
+  };
+});
 // 新增包件
 const Addpackages = () => {
   form.value.Packageloading = true;
@@ -362,6 +480,7 @@ const Addpackages = () => {
   };
   form.value.PackageList.push(data);
 };
+
 // 移除包件
 const Removepackage = index => {
   console.log(index, 'index');
@@ -390,6 +509,7 @@ const Removepackage = index => {
 const ViewhistoricalPackages = () => {
   form.value.historydialog = true; //打开弹窗
 };
+
 const historyPush = () => {};
 // 提交
 const onSubmit = () => {
@@ -527,14 +647,14 @@ const TabactiveClick = (a, b) => {
       margin-bottom: 0;
     }
   }
-  .el_Basic{
+  .el_Basic {
     flex: 1;
     display: flex;
-    .el_Processing{
-        width: 54%;
+    .el_Processing {
+      width: 54%;
     }
-    .el_Investigation{
-        flex: 1;
+    .el_Investigation {
+      flex: 1;
     }
   }
 }
diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index e73ff931..1e7546e5 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -1592,14 +1592,15 @@ const InInputSo = (values, val) => {
 const InputSo = val => {
   TcPdloading.value = true;
   console.log(val, '搜索框接收的值');
+  console.log( UncountedDetails.value,' UncountedDetails.value');
   let data = {};
   console.log(row.value, 'row.value');
   data.current = TccurrentPage.value;
   data.size = TcpageSize.value;
 
   let dataS = {
-    questNum: UncountedDetails.value.questNum,
-    questId: UncountedDetails.value.id,
+    questNum: UncountedDetails.value?UncountedDetails.value.questNum:'',
+    questId: UncountedDetails.value?UncountedDetails.value.id:'',
     current: TccurrentPage.value, //页码
     size: TcpageSize.value, //条数
     [val.prop]: val.values,