新增规格字段，新增驳回功能

src/option/distribution/DeliveryExceptionReview.js

@@ -203,6 +203,28 @@ export const AbnormalReview = [
     sortable: false,
     head: false,
   },
+  {
+    prop: 'isAbnormalLoading',
+    label: '异常装车',
+    type:1,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: false,
+    head: false,
+  },
+  {
+    prop: 'isAbnormalSigning',
+    label: '异常签收',
+    type: 1,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: false,
+    head: false,
+  },
   //   {
   //     prop: 'materialCode',
   //     label: '物料编号',

src/page/index/index.vue

@@ -105,8 +105,7 @@ export default {
   methods: {
     // 打开AI
     AiClick(){
-      console.log('111');
-      this.templateInfo=true
+      this.templateInfo=!this.templateInfo
     },
     // 关闭弹窗
     provideData(data){
@@ -150,8 +149,8 @@ export default {
   position: fixed;
   right: 10px;
   top: 70%;
-  width: 50px;
-  height: 50px;
+  width: 30px;
+  height: 30px;
   background-color: #172e60;
   border-radius: 50%;
   color: #fff;
@@ -160,6 +159,7 @@ export default {
   justify-content: center;
   z-index: 999999999;
   cursor: pointer;
+  box-shadow: 0px 2px 2px 0px #969696;
 }
 .el-card__body {
   padding: 10px !important;

src/page/login/aiqa.vue

@@ -46,7 +46,7 @@
                     fit="cover"
                   />
                   <!-- 下载地址 -->
-                  <a v-if="item.link" :href="item.link">
+                  <a v-if="item.link" :href="item.link" target="_blank" rel="noopener noreferrer">
                     <el-link :underline="false">点击这里下载</el-link></a
                   >
                 </div>
@@ -120,6 +120,12 @@ const Data = ref({
     {
       content: '扫描仪驱动下载地址',
     },
+    {
+      content: '扫描仪出现问题如何解决',
+    },
+    {
+      content: '谷歌浏览器下载地址',
+    },
   ],
   ChathistoryList: [
     // {
@@ -198,7 +204,7 @@ const inputData = value => {
   }
   let data = {
     state: 'user', //用户标识
-    name: Data.value.name|| '未登录', //用户昵称
+    name: Data.value.name || '未登录', //用户昵称
     content: value, //聊天消息
     time: setCurrentTime(),
   };
@@ -218,11 +224,11 @@ const AiData = (value = '') => {
     name: '货无忧智能AI', //昵称
     content: aiResponse, //文本描述
     link: '', //文件下载地址
-    time: setCurrentTime(),
+    time: setCurrentTime(),//日期
   };
 
   if (isFirstMessage.value) {
-    aiResponse = '你好，我是货无忧智能AI，有什么可以帮助你的吗？';
+    aiResponse = '你好，我是货无忧智能AI，有什么可以帮助您的吗？';
     isFirstMessage.value = false;
   } else {
     const lowercaseValue = value.toLowerCase();
@@ -234,6 +240,13 @@ const AiData = (value = '') => {
       aiResponse = '货无忧小程序如下，扫描图片既可以访问';
       data.url = Qrxcx;
       data.srcList = [Qrxcx];
+    } else if (
+      lowercaseValue.includes('你好') ||
+      lowercaseValue.includes('你是谁') ||
+      lowercaseValue.includes('你叫什么名字')
+    ) {
+      aiResponse =
+        '您好,我是货无忧智能AI，有什么可以帮助您的吗?可以尝试输入关键字，如：小程序、app、打印驱动、扫描仪驱动或者点击右侧问题进行提问。';
     } else if (
       lowercaseValue.includes('app') ||
       lowercaseValue.includes('app下载') ||
@@ -249,19 +262,28 @@ const AiData = (value = '') => {
       aiResponse = '打印机启动下载地址如下：';
       data.link = 'http://47.108.51.143:9000/logpm/other/CLodop_Setup_for_Win32NT.exe';
     } else if (
-      lowercaseValue.includes('扫描驱动') ||
+      lowercaseValue.includes('扫描仪驱动') ||
       lowercaseValue.includes('扫描仪驱动下载地址')
     ) {
-      aiResponse = '待添加...';
-      data.link = '';
+      aiResponse = '扫描仪驱动如下：';
+      data.link = 'http://files.huo5u.com/plugins/WebCamera_V1.3.7.exe';
     } else if (
       lowercaseValue.includes('扫描仪') ||
       lowercaseValue.includes('扫描仪出现问题如何解决')
+    ) {
+      aiResponse =
+        '扫描仪出现问题需要复制如下地址，然后打开谷歌浏览器在浏览器地址中输入这个地址：chrome://flags/#block-insecure-private-network-requests ,把黄色部分选择Disabled然后重启浏览器,或者检查驱动是否启动，线束是否连接完整';
+    } else if (
+      lowercaseValue.includes('扫描仪报错') ||
+      lowercaseValue.includes('扫描仪报错如何解决')
     ) {
       aiResponse =
         '扫描仪出现问题需要复制如下地址，然后打开谷歌浏览器在浏览器地址中输入这个地址：chrome://flags/#block-insecure-private-network-requests ,把黄色部分选择Disabled然后重启浏览器';
+    } else if (lowercaseValue.includes('谷歌') || lowercaseValue.includes('谷歌浏览器下载地址')) {
+      aiResponse = '谷歌浏览器下载地址如下：';
+      data.link = 'https://www.google.cn/intl/zh-CN/chrome/?';
     } else {
-      aiResponse = '我不太理解您的问题，请重新描述或输入其他问题。';
+      aiResponse = '我不太理解您的问题，我正在努力学习中，请重新描述或输入其他问题，或联系管理员';
     }
   }
 
@@ -368,7 +390,7 @@ AiData(); //初始化AI机器人
     display: flex;
     justify-content: space-between;
     overflow-y: hidden;
-    box-shadow: 0px 2px 4px #9E9E9E;
+    box-shadow: 0px 2px 4px #9e9e9e;
     .left {
       width: 66%;
       border-right: 1px solid #d3832a;

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -886,7 +886,7 @@
               >审 核</el-text
             >
               <el-text
-              v-if="slotProps.scope.row.auditingStatusName == '待审核'"
+                v-if="slotProps.scope.row.isAbnormalSigning == '否' &&   slotProps.scope.row.auditingStatusName == '待审核'"
                 type="primary"
                 text
                 icon="el-icon-view"
@@ -910,8 +910,8 @@
     width="500"
   >
     <div>
-      <span>货物是否在库:&emsp;</span>
-      <el-select
+      <span>请联系司机进行滞留扫描操作</span>
+      <!-- <el-select
       v-model="yesOrNo"
       placeholder="请选择货物是否在库"
       style="width: 240px"
@@ -922,11 +922,11 @@
         :label="item.label"
         :value="item.value"
       />
-    </el-select>
+    </el-select> -->
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button @click="dialogViReject = false">取消</el-button>
         <el-button type="primary" @click="ViReject">
           确定
         </el-button>
@@ -1007,7 +1007,7 @@ export default {
     ],
       dialogViReject:false,//驳回弹窗
       RejectRow:{},//驳回点击当前单子
-      yesOrNo:null,
+      yesOrNo:false,
       accessControl:'',
       html: '',
       reservationActiveName: 'reservationPackage',
@@ -3933,6 +3933,18 @@ if($useStore.getters && $useStore.getters.permission){
       loadingAbnormalPackageListDetail(scope.signId)
         .then(res => {
           console.log(res, '异常审核查询');
+          res.data.data.forEach(res=>{
+            if(res.isAbnormalSigning==1){
+              res.isAbnormalSigning='否'
+            }else{
+              res.isAbnormalSigning='是'
+            }
+            if(res.isAbnormalLoading==1){
+              res.isAbnormalLoading='否'
+            }else{
+              res.isAbnormalLoading='是'
+            }
+          })
           this.AbnormalReviewData = res.data.data;
         })
         .catch(res => {
@@ -3949,14 +3961,6 @@ if($useStore.getters && $useStore.getters.permission){
     },
     // 确定驳回
     ViReject(){
-      if(this.yesOrNo==null){
-        ElMessage({
-        message: '请选择货物是否在库',
-        type: 'warning',
-        })
-        return
-      }
-      console.log(this.RejectRow,'this.RejectRow');
       let data={
         ids:this.RejectRow.id,
         yesOrNo:this.yesOrNo,

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -253,6 +253,9 @@
           <el-form-item label="SKU" prop="mallName">
             <el-input v-model="formMaterial.sku" placeholder="请输入SKU" />
           </el-form-item>
+          <el-form-item label="规格">
+            <el-input v-model="formMaterial.packingSpecification"  disabled placeholder="请输入规格" />
+          </el-form-item> 
         </el-form>
         <!-- 表单按钮 -->
         <template #footer>
@@ -843,12 +846,14 @@ export default {
           this.formMaterial.materialCode = a.productCode;
           this.formMaterial.materialUnit = a.logpmUnit;
           this.formMaterial.sku = a.sku;
+          this.formMaterial.packingSpecification=a.packingSpecification
           break;
         case '2':
           let b = this.optionsCode.find(i => i.id == row);
           this.formMaterial.materialId = b.name;
           this.formMaterial.materialUnit = b.logpmUnit;
           this.formMaterial.sku = b.sku;
+          this.formMaterial.packingSpecification=b.packingSpecification
           break;
       }
     },

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -529,18 +529,30 @@
       </div>
       <!-- 包件搜索 -->
       <div v-else class="el_package">
-        <el-form :model="PackageFrom">
+        <div class="el_multifunctional">
+                      <el-input
+                        v-model="PackInpiut"
+                        placeholder="请输入要搜索的值,多条件用英文逗号拼接"
+                        clearable
+                        @clear="PackSearchFu"
+                      />
+                      <el-button type="primary" @click="PackSearchFu"
+                        ><el-icon><Plus /></el-icon>搜索</el-button
+                      >
+                    </div>
+        
+        <!-- <el-form :model="PackageFrom">
           <el-form-item label="运单号:">
             <el-input v-model="PackageFrom.waybillNumber" clearable placeholder="请输入运单号" />
           </el-form-item>
           <el-form-item label="包条码:">
             <el-input v-model="PackageFrom.orderPackageCode" placeholder="请输入包条码" />
           </el-form-item>
-        </el-form>
+        </el-form> -->
       </div>
 
       <!-- 顶部开始 -->
-      <div class="flex-c-sb">
+      <div class="flex-c-sb" v-if="!wrapLoading">
         <!-- 表格顶部左侧按钮 -->
         <div>
           <el-button type="primary" @click="SoInput"
@@ -722,6 +734,7 @@ const numTab = ref([
   },
 ]);
 const num = ref(null); //计步器
+const PackInpiut=ref('');//包件搜索参数
 const sjSelect=ref(null)
 const clSelect=ref(null)
 const Totalnumberoforders = ref(0); //订单总件数
@@ -2306,8 +2319,19 @@ function removeDuplicates(arr) {
 const soclear = () => {
   SearchFu();
 };
-
+const PackSearchFu=()=>{
+  if (PackInpiut.value) {
+    scrollToElementWithinTableRow(PackInpiut.value);
+  } else {
+    document.querySelectorAll('[id]').forEach(function (el) {
+      el.style.backgroundColor = ''; // 移除背景颜色
+      el.style.color = ''; // 移除文字颜色
+    });
+  }
+}
 function scrollToElementWithinTableRow(partialIdString) {
+  console.log(partialIdString,'partialIdString');
+  
   // 清空之前的样式
   const tableRows = document.querySelectorAll('tr');
   tableRows.forEach(function(row) {
@@ -2326,8 +2350,9 @@ function scrollToElementWithinTableRow(partialIdString) {
     let allIdsFound = partialIds.every(partialId => {
       return Array.from(row.querySelectorAll('[id]')).some(cell => cell.id.includes(partialId));
     });
-
-    if (allIdsFound) {
+   if (allIdsFound) {
+      console.log(row,'row');
+      
       // 行包含所有partialIds, 则高亮显示并滚动到该行
       const cells = row.querySelectorAll('[id]');
       cells.forEach(function(cell) {
@@ -2344,7 +2369,6 @@ function scrollToElementWithinTableRow(partialIdString) {
 // 编辑多功能搜索
 const SearchFu = () => {
   console.log(multifunctional.value, '搜索的参数值');
-
   if (multifunctional.value) {
     scrollToElementWithinTableRow(multifunctional.value);
   } else {
@@ -2353,9 +2377,7 @@ const SearchFu = () => {
       el.style.color = ''; // 移除文字颜色
     });
   }
-
   return;
-
   // console.log(dataInfo.value, '搜索结果');
 };
 
@@ -3844,6 +3866,8 @@ sjInput.value=''
   color: #fff;
 }
 .el_package {
+  display: flex;
+  justify-content: flex-end;
   :deep(.el-form) {
     justify-content: flex-start !important;
   }