Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/aftersales/aftersalesWorkOrder.vue

@@ -1232,9 +1232,9 @@ const AppealStatusT = ref(false); //是否为申诉列表
 const loadingCustomer = ref(false); //客服介入弹窗加载
 const TabList = ref([
   { name: 0, label: '全部', state: true, request: true, DataList: [], total: '' },
-  { name: 3, label: '待处理', state: true, request: true, DataList: [], total: '' },
-  { name: 9, label: '待审核', state: true, request: true, DataList: [], total: '' },
   { name: 8, label: '待回复', state: false, request: true, DataList: [], total: '' },
+  { name: 3, label: '待处理(新建)', state: true, request: true, DataList: [], total: '' },
+  { name: 9, label: '待审核', state: true, request: true, DataList: [], total: '' },
   { name: 1, label: '处理中', state: true, request: true, DataList: [], total: '' },
   { name: 2, label: '处理完毕', state: true, request: true, DataList: [], total: '' },
   { name: 6, label: '仲裁中', state: true, request: true, DataList: [], total: '' },

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
@@ -99,16 +99,27 @@
                       placement="top"
                     >
                       <el-input
-                        v-model="item.orderCode"
-                        :disabled="identifying != '2'"
+                        v-model="item.orderCode"  
                         :placeholder="
-                          identifying != '2' ? '订单自编号(自动带出)' : '请输入订单自编号'
+                          identifying != '2' ? '订单自编号' : '请输入订单自编号'
                         "
                       />
                     </el-tooltip>
                   </el-form-item>
                 </div>
 
+                <div class="maxBox">
+                  <el-form-item label="一级品">
+                    <el-input v-model="item.first" style="width: 240px" placeholder="请输入一级品" />
+                  </el-form-item>
+                </div> 
+                 
+                <div class="maxBox">
+                  <el-form-item label="二级品">
+                    <el-input v-model="item.secondary" style="width: 240px" placeholder="请输入二级品" />
+                  </el-form-item>
+                </div> 
+
                 <div class="maxBox">
                   <el-form-item label="品牌">
                     <el-tooltip :content="item.brandName ? item.brandName : '品牌'" placement="top">
@@ -253,13 +264,13 @@
         />
       </el-form-item>
 
-      <el-form-item label="一级品" prop="first">
+      <!-- <el-form-item label="一级品" prop="first">
         <el-input v-model="Indexform.first" placeholder="请输入一级品类" />
-      </el-form-item>
-
-      <el-form-item label="二级品" prop="secondary">
+      </el-form-item> -->
+      
+      <!-- <el-form-item label="二级品" prop="secondary">
         <el-input v-model="Indexform.secondary" placeholder="请输入二级品类" />
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="入库时间" prop="warehousingTime" v-if="groundlineType == 4">
         <el-date-picker
@@ -311,11 +322,14 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item v-if="isShowFormItem1"> </el-form-item>
+
+      <el-form-item v-if="isShowFormItem1"></el-form-item>
       <el-form-item v-if="isShowFormItem2"> </el-form-item>
+      <el-form-item v-if="isShowFormItem3"> </el-form-item>
+      <el-form-item v-if="isShowFormItem4"> </el-form-item>
+
       <el-form-item
         label="调查经过"
-        style="height: auto ,align-items: flex-start;"
         prop="investigationPocess"
         class="Investigationprocess"
       >
@@ -323,13 +337,14 @@
           v-model="Indexform.investigationPocess"
           placeholder="请输入调查经过"
           clearable
-          :rows="5"
+          :rows="1"
           type="textarea"
         />
       </el-form-item>
-
-      <el-form-item> </el-form-item>
-
+   
+   
+ 
+   
       <el-tabs type="border-card" class="el_nint">
         <el-tab-pane label="内部责任划分">
           <div class="ResponsibilityBox">
@@ -359,6 +374,7 @@
                       v-else
                       v-model="item.businessName"
                       filterable
+                      clearable
                       placeholder="请选择责任方"
                       @change="ResponsiblePartychange(item.businessName, index)"
                     >
@@ -418,9 +434,9 @@
                   </el-form-item>
                 </div>
 
-                <div class="maxBox">
+                <div class="maxBox illustrate">
                   <el-form-item label="说明">
-                    <el-input v-model="item.description" placeholder="请输入说明 " :rows="2" />
+                    <el-input v-model="item.description" type="textarea" placeholder="请输入说明 " :rows="1" />
                   </el-form-item>
                 </div>
               </div>
@@ -698,7 +714,7 @@ const Paymentmethod = ref([]); //支付方式
 const Mydata = ref(); //当前登录人信息
 const PackageInfo = ref([
   //包件信息
-  { packageCode: '', orderCode: '', waybillNumber: '', brandName: '', state: false },
+  { packageCode: '', orderCode: '',first:'',secondary:'', waybillNumber: '', brandName: '', state: false },
 ]);
 // 责任方列表
 const FangAddList = ref([
@@ -799,6 +815,9 @@ const handle = () => {
 
 // 获取当前责任方的责任人
 const ResponsiblePartychange = (val, index) => {
+  if(!val){
+    return
+  }
   FangAddList.value[index].personResponsibleName = null; //清空当前选择的责任人
   $_getBusinessDepartmentUser({
     warehouseId: val,
@@ -905,6 +924,9 @@ const abnormalChange = val => {
   // } else {
   //   Indexform.value.packageCode = null;
   // }
+  // 切换类型重置图片
+  Indexform.value['packList']=[]
+  console.log(Indexform.value);
 };
 
 // 发现节点事件
@@ -1031,6 +1053,8 @@ const AddPackage = () => {
     brandName: '',
     state: false,
     mallName: '',
+    secondary:'',
+    first:'',
   });
 };
 // 包件移除
@@ -1075,6 +1099,8 @@ const TopChange = val => {
       brandName: '',
       state: false,
       mallName: '',
+      secondary:'',
+      first:'',
     },
   ]; //重置包件信息
   Indexform.value = {}; //重置表单
@@ -1124,8 +1150,8 @@ const rules = reactive({
   vehicleRoute: [{ required: true, message: '请填写车辆线路', trigger: 'blur' }],
   deliverGoodsTime: [{ required: true, message: '请填写发货时间', trigger: 'blur' }],
   discoveryTime: [{ required: true, message: '请填写发现时间', trigger: 'blur' }],
-  first: [{ required: true, message: '请填写一级品', trigger: 'blur' }],
-  secondary: [{ required: true, message: '请填写二级品', trigger: 'blur' }],
+  // first: [{ required: true, message: '请填写一级品', trigger: 'blur' }],
+  // secondary: [{ required: true, message: '请填写二级品', trigger: 'blur' }],
   warehousingTime: [{ required: true, message: '请填写入库时间', trigger: 'blur' }],
   processor: [{ required: true, message: '请填选择处理方', trigger: 'blur' }],
   waybillMall: [{ required: true, message: '请填写运单商场', trigger: 'blur' }],
@@ -1227,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, //二级品类
             });
           }
         });
@@ -1738,11 +1766,17 @@ const ViewPackageDetails = val => {
 
 // 对调查经过输入框进行处理
 const isShowFormItem1 = computed(() => {
-  return !['1', '2', '5', '6', '7'].includes(groundlineType.value);
+  return ['2'].includes(groundlineType.value);
 });
 // 对调查经过输入框进行处理
 const isShowFormItem2 = computed(() => {
-  return !['2', '5', '6', '7', '8'].includes(groundlineType.value);
+  return ['2'].includes(groundlineType.value);
+});
+const isShowFormItem3 = computed(() => {
+  return ['3','4','5','6','7'].includes(groundlineType.value);
+});
+const isShowFormItem4 = computed(() => {
+  return ['5','6','7'].includes(groundlineType.value);
 });
 </script>
 
@@ -1753,9 +1787,8 @@ const isShowFormItem2 = computed(() => {
   justify-content: flex-start;
   border: 1px solid #ccc;
   .el-form-item {
-    height: 46px;
     display: flex;
-    align-items: center;
+    align-items: flex-start;
     margin: 0;
     margin-bottom: 18px;
     flex: 1 0 30%;
@@ -1880,12 +1913,19 @@ const isShowFormItem2 = computed(() => {
   }
 }
 .ResponsibilityBox {
+  :deep(.asterisk-left){
+    .el-form-item__label{
+      width: auto !important;
+    }
+  }
+
   width: 100%;
   display: flex;
   flex-direction: column;
   .leftbox {
     display: flex;
     justify-content: space-between;
+    width: 100%;
     .el_zb {
       width: 140px;
       margin-right: 50px;
@@ -1901,10 +1941,13 @@ const isShowFormItem2 = computed(() => {
         flex-wrap: nowrap;
       }
     }
+    .illustrate{
+      width: 50%;
+    }
   }
   .maxBox {
     display: flex;
-    align-items: center;
+    align-items: flex-start;
     width: 30%;
     margin-right: 16px;
     font-size: 14px;
@@ -2139,9 +2182,8 @@ const isShowFormItem2 = computed(() => {
 .Investigationprocess {
   height: auto !important;
   align-items: flex-start !important;
-  flex: 1 0 44% !important;
   :deep(.el-form-item__content) {
-    width: 100% !important;
+    width: 90% !important;
   }
 }
 .el_tool {
@@ -2162,6 +2204,7 @@ const isShowFormItem2 = 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;
@@ -2178,6 +2221,6 @@ const isShowFormItem2 = computed(() => {
 
 }
 .el_btn_remove{
-  padding-top: 6px;
+  // padding-top: 6px;
 }
 </style>

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
             > -->

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
             >

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
             > -->

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
             >

src/views/distribution/signfor/distributionSignfor.vue

@@ -727,19 +727,27 @@ export default {
      * 导出
      * */
     handleExportInfo() {
+      this.loading=true
       let row = {};
       // if (!!this.ids) {
       //   row.ids = this.ids;
       // }
-      const ids = this.selectionList.join(',');
+      const ids = this.selectionList.map(item=>item.id).join(',');
+   
       row.ids = ids;
       row.signingStatus = '2';
       row = { ...row, ...this.query };
       // console.log("<><><>>",ids);
       getSignforExportOwn(row).then(res => {
+
         // console.log(res.data);
+      
         downloadXls(res.data, '签收数据.xlsx');
-      });
+      }).catch(()=>{
+
+      }).finally(()=>{
+        this.loading=false  
+      })
     },
     handlePictureInfo() {
       let row = {};