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

src/page/login/aiqa.vue

@@ -138,9 +138,9 @@ const Data = ref({
     {
       content: '东集pad-q7恢复出厂设置',
     },
-    {
-      content: '货无忧的汇通物流公司编码是多少',
-    },
+    // {
+    //   content: '货无忧的汇通物流公司编码是多少',
+    // },
     {
       content: '蓝牙打印机芝柯tx453设备连接密码是多少',
     },
@@ -319,11 +319,11 @@ const AiData = (value = '') => {
     ) {
       aiResponse = '东集pad-q7恢复出厂设置教程地址:1、关机状态下，按下【电源键】、【两侧扫描键】； 2、出现开机画面，松开【电源键】，出现工厂模式界面，按键全部松开；3、进入工厂模式后通过方向键选择【wipe data/factory reset】, 按电源键确认进入子菜单，选择【yes】，按【电源键】确认，恢复出厂完成后选择第一个【reboot system now】 ，按【电源键】确认重启设备。视频教程如下:https://mp.weixin.qq.com/s/0CG-jYooh9LJ-9aLauVGfA';
     }
-    else if (
-      lowercaseValue.includes('货无忧的汇通物流公司编码是多少')
-    ) {
-      aiResponse = '货无忧的汇通物流公司编码是：627683';
-    }
+    // else if (
+    //   lowercaseValue.includes('货无忧的汇通物流公司编码是多少')
+    // ) {
+    //   aiResponse = '货无忧的汇通物流公司编码是：627683';
+    // }
     else if (
       lowercaseValue.includes('蓝牙打印机芝柯tx453设备连接密码是多少') ||  lowercaseValue.includes('tx453')
     ) {

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -636,9 +636,13 @@
               </el-radio-group>
             </el-form-item>
 
-            <el-form-item label="备注">
+            <el-form-item label="文员备注">
               <el-input v-model="TcForm.clerkSignRemarks" placeholder="暂无备注" />
             </el-form-item>
+            
+            <el-form-item label="司机备注">
+              <el-input v-model="TcForm.driverRemarks" placeholder="暂无备注" disabled/>
+            </el-form-item>
           </el-form>
           <div class="imgName">
             <span>上门照</span>

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -280,9 +280,14 @@
               </el-radio-group>
             </el-form-item>
 
-            <el-form-item label="备注">
+            <el-form-item label="文员备注">
               <el-input v-model="TcForm.clerkSignRemarks" placeholder="暂无备注" />
             </el-form-item>
+
+            <el-form-item label="司机备注:">
+              <el-input v-model="TcForm.driverRemarks" placeholder="暂无备注" disabled />
+            </el-form-item>
+
           </el-form>
           <div class="imgName">
             <span>上门照</span>
@@ -445,10 +450,7 @@
             </el-dialog>
           </div>
 
-          <div>
-            <div class="title fwb">司机备注：</div>
-            <div class="title fwb">{{ form.driverRemarks }}</div>
-          </div>
+
 
           <div class="tj-ttn">
             <el-button type="primary" @click="submitForm">确定</el-button>