Merge branch 'master' into stage

src/views/salesMange/shipmentMange/document/index.vue

@@ -2383,10 +2383,19 @@
                 <tr>
                   <td
                     colspan="2"
-                    style="text-align: left; height: 120px; vertical-align: top"
+                    style="
+                      text-align: left;
+                      height: 120px;
+                      vertical-align: top;
+                      position: relative;
+                    "
                   >
-                    <span> 其他要求：</span>
-                    <span v-if="textShowOne">{{ mandateData.otherAsk }}</span>
+                    <span style="position: absolute; left: 8px; top: 4px">
+                      其他要求：</span
+                    >
+                    <span v-if="textShowOne" style="margin-left: 65px">{{
+                      mandateData.otherAsk
+                    }}</span>
                     <el-input
                       autosize
                       placeholder="请输入"
@@ -2395,7 +2404,7 @@
                       v-model="mandateData.otherAsk"
                       size="small"
                       :rows="5"
-                      style="width: 82%"
+                      style="width: 82%; margin-left: 65px"
                     />
                   </td>
                 </tr>
@@ -2451,7 +2460,7 @@
                     colspan="2"
                     style="
                       text-align: left;
-                      height: 77.5px;
+                      height: 80.05px;
                       vertical-align: top;
                     "
                   >
@@ -2509,9 +2518,7 @@
         </div>
       </div>
       <template #footer>
-        <el-button @click="openCustomsDeclaration = false" size="large"
-          >取消</el-button
-        >
+        <el-button @click="mandateDialog = false" size="large">取消</el-button>
         <el-button
           type="primary"
           @click="textShowOne = !textShowOne"