入仓影像

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -88,7 +88,7 @@
               <el-input v-else v-model.number="tableData[$index].weight" placeholder=""></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="数量">
+          <el-table-column label="数量" width="130px">
             <template v-slot="{r,c,$index}">
               <span v-if="tableData[$index].id">{{ tableData[$index].quantityAll }}</span>
               <el-input v-else v-model.number="tableData[$index].quantityAll" placeholder="">

src/views/ecw/order/warehousing/index.vue

@@ -89,6 +89,15 @@
         </el-input>
       </el-form-item>
 
+      <el-card style="margin-top: 15px;">
+        <div slot="header" class="clearfix">
+          <span style="font-size: 18px">入仓影像</span>
+        </div>
+        <div>
+          <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form.urls" ></image-and-video-upload>
+        </div>
+      </el-card>
+
       <div style="text-align: center;margin-top: 15px" v-if="order.status !== 5">
         <el-button @click="escapeBol = true;" type="primary">转异</el-button>
         <el-button type="primary" @click="finishVisible = true">完成入仓</el-button>
@@ -130,6 +139,20 @@
         <el-button @click="escapeBol = false">取消</el-button>
       </span>
     </el-dialog>
+
+    <!--    <el-dialog-->
+    <!--      title="转异常单"-->
+    <!--      :visible.sync="dialogVisible"-->
+    <!--      width="30%"-->
+    <!--      :before-close="handleClose(done)"-->
+    <!--    >-->
+    <!--      <span>这是一段信息</span>-->
+    <!--      <span slot="footer" class="dialog-footer">-->
+    <!--       <el-button type="primary" @click="dialogVisible = false">确认并完成入仓</el-button>-->
+    <!--       <el-button @click="dialogVisible = false">取 消</el-button>-->
+    <!--     </span>-->
+    <!--    </el-dialog>-->
+
     <print-tag v-if="isShowPrintTag" :order-id="orderId" @close="isShowPrintTag = false"></print-tag>
 
     <print-warehouse-receipt v-if="isShowPrint" :order-id="orderId" @close="isShowPrint = false" />
@@ -153,6 +176,7 @@ import PrintTag from "@/views/ecw/order/components/PrintTag"
 import PrintWarehouseReceipt from "@/views/ecw/order/components/PrintWarehouseReceipt"
 import imageUpload from "@/components/ImageUpload";
 import {parseTime} from "@/utils/ruoyi"
+import ImageAndVideoUpload from '@/components/ImageAndVideoUpload'
 export default {
   name: "Warehousing",
 
@@ -162,7 +186,8 @@ export default {
     editDialog,
     PrintTag,
     PrintWarehouseReceipt,
-    imageUpload
+    imageUpload,
+    ImageAndVideoUpload,
   },
 
   mounted() {
@@ -189,6 +214,7 @@ export default {
         exceptionUrls:[],
         descZh:'',
         manualExceptionType:'',
+        urls: []
       },
       currencyList:[],
       order: {},
@@ -207,7 +233,8 @@ export default {
       let p = {
         orderSpecialNeedReceivableReqVoList: this.form.orderSpecialNeedReceivableReqVoList,
         "orderLocationCreateReqVOList": this.form.orderLocationCreateReqVOList,
-        "orderId": this.order.orderId
+        "orderId": this.order.orderId,
+        urls: this.form.urls
       }
        if(this.escapeBol){
          p.exceptionUrls = this.form.exceptionUrls.split(',');