Merge remote-tracking branch 'origin/release2.2' into release2.2

src/components/ImageAndVideoUpload/index.vue

@@ -46,6 +46,7 @@
 
 <script>
 import { getToken } from "@/utils/auth";
+import {warehousePictureCreate} from "@/api/ecw/order";
 
 export default {
   props: {
@@ -65,6 +66,15 @@ export default {
       type: Boolean,
       default: true
     },
+    // 类型 1入仓 2 调拨出仓 3调拨到仓 4 订单转异
+    type: {
+      type: Number,
+      default: undefined
+    },
+    id: {
+      type: Number,
+      default: undefined
+    },
     readonly: {
       type: Boolean,
       default: false
@@ -121,9 +131,11 @@ export default {
   methods: {
     // 删除图片
     handleRemove(index) {
+      if (this.id && this.type) {
+        this.$emit("delete", this.fileList[index].url);
+      }
       this.fileList.splice(index, 1);
       this.$emit("input", this.listToString(this.fileList));
-
     },
     // 上传成功回调
     handleUploadSuccess(res) {
@@ -133,8 +145,21 @@ export default {
           this.fileList = this.fileList.concat(this.uploadList);
           this.uploadList = [];
           this.number = 0;
+          if (this.id && this.type) {
+            warehousePictureCreate({
+              "bizId": this.id,
+              "type": this.type,
+              "url": res.data
+            }).then(() => {
               this.$emit("input", this.listToString(this.fileList));
+              this.$emit("refresh");
               this.$modal.closeLoading();
+            })
+          } else {
+            this.$emit("input", this.listToString(this.fileList));
+            this.$emit("refresh");
+            this.$modal.closeLoading();
+          }
         }
       }else {
         this.handleUploadError();

src/views/ecw/order/components/specialNeeds.vue

@@ -12,7 +12,7 @@
         </el-form-item>
         <el-form-item :label="$t('特殊要求备注')"><el-input  type="textarea" style="width: 300px;" v-model="todoDetail"></el-input></el-form-item>
         <el-form-item v-for="(item,index) in  this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS)" v-if="advanceType.indexOf(item.value) > -1" :key="item.value" :label="item.label + '预计金额'">
-          <el-input style="width: 300px;" v-model.number="specialNeedsList[index].transFee">
+          <el-input style="width: 300px;" v-model.number="specialNeedsList[index].transFee" type="number">
             <div style="width: 100px;" slot="append" >
               <el-select   v-model="specialNeedsList[index].transCurrency">
                 <el-option v-for="item in JSON.parse(currency)" :key="item.id" :label="item.titleZh" :value="item.id" />

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

@@ -65,7 +65,7 @@
               </el-col>
               <el-col :span="16">
                 <el-form-item :label="$t('入仓特性')" style="margin-top: 20px">
-                  <el-checkbox-group v-model="form.prodAttrIds">
+                  <el-checkbox-group v-model="form.warehouseInProdAttrIds">
                     <el-checkbox v-for="item in attrList" :key="item.id" :label="item.id">{{ item.attrName }}</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
@@ -209,7 +209,14 @@
               <span style="font-size: 18px">{{$t('入仓影像')}}</span>
             </div>
             <div>
-              <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form.pictureUrls" ></image-and-video-upload>
+              <image-and-video-upload
+                :fileSize="50"
+                :isShowTip="true"
+                v-model="form.pictureUrls"
+                :id="orderItemId"
+                :type="5"
+                @delete="handleImageDelete"
+              ></image-and-video-upload>
             </div>
           </el-card>
         </el-tab-pane>
@@ -269,7 +276,7 @@
               </el-col>
               <el-col :span="16">
                 <el-form-item :label="$t('入仓特性')" style="margin-top: 20px">
-                  <el-checkbox-group v-model="form1.prodAttrIds">
+                  <el-checkbox-group v-model="form1.warehouseInProdAttrIds">
                     <el-checkbox v-for="item in attrList" :key="item.id" :label="item.id">{{ item.attrName }}</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
@@ -489,7 +496,11 @@ import {getFeeTypeByOrderProduct, getProductBrankPage} from "@/api/ecw/productBr
 import {cancelProcessInstance} from "@/api/bpm/processInstance"
 import WorkFlow from "@/components/WorkFlow"
 import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict"
-import {orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api/ecw/order"
+import {
+  orderWarehouseIn,
+  orderWarehouseInUpdateApply, warehousePictureDelete,
+  warehousePictureList
+} from "@/api/ecw/order"
 import {getProductAttrList} from "@/api/ecw/productAttr"
 import {getProductTypeList} from "@/api/ecw/productType"
 import {addProduct} from "@/api/ecw/product"
@@ -560,6 +571,9 @@ export default {
     orderId(){
       return this.order.orderId
     },
+    orderItemId(){
+      return this.warehousing.orderItemId
+    },
     brandObject(){
       return this.brandList.find(e => e.id === this.form.brand) || ''
     },
@@ -638,7 +652,7 @@ export default {
         inTime: undefined,
         material: undefined,
         orderItemId: undefined,
-        prodAttrIds: [],
+        warehouseInProdAttrIds: [],
         prodId: undefined,
         prodTitleEn: undefined,
         prodTitleZh: undefined,
@@ -657,7 +671,7 @@ export default {
         inTime: undefined,
         material: undefined,
         orderItemId: undefined,
-        prodAttrIds: [],
+        warehouseInProdAttrIds: [],
         prodId: undefined,
         prodTitleEn: undefined,
         prodTitleZh: undefined,
@@ -728,7 +742,10 @@ export default {
       this.form.orderId = this.warehousing.orderId
       this.form.orderItemId = this.warehousing.orderItemId
       this.form.orderNo = this.warehousing.orderNo
-      this.form.prodAttrIds = this.warehousing.prodAttrIds?.split(',').map(e => +e) || []
+      this.form.warehouseInProdAttrIds =
+        this.warehousing.warehouseInProdAttrIds?.split(',').map(e => +e)
+        || this.warehousing.prodAttrIds?.split(',').map(e => +e)
+        || []
       this.form.prodId = this.warehousing.prodId
       this.form.prodTitleEn = this.warehousing.prodTitleEn
       this.form.prodTitleZh = this.warehousing.prodTitleZh
@@ -765,6 +782,22 @@ export default {
         this.handleAdd(1)
       }
     },
+    handleImageDelete(url) {
+      warehousePictureList({
+        bizId: this.orderId,
+        type: 1
+      }).then(r =>{
+        console.log(r, url)
+        if (r.data?.length > 0) {
+          const id = r.data.find(e => e?.url === url)?.id
+          if (id) {
+            warehousePictureDelete(id).then(r => {
+              console.log(r)
+            })
+          }
+        }
+      })
+    },
     handleClose() {
       this.visible = false
     },
@@ -784,7 +817,7 @@ export default {
     handleSubmit() {
       if (this.activeName !== "first"){
         // 添加非填单货物
-        if (this.form1.prodAttrIds.indexOf(4) !== -1) {
+        if (this.form1.warehouseInProdAttrIds.indexOf(4) !== -1) {
           return this.$notify({
             title: this.$t('提示'),
             message: this.$t("订单包含不接受货物，请检查"),
@@ -802,7 +835,7 @@ export default {
               orderId: this.warehousing.orderId,
               orderItemId: undefined,
               orderNo: this.warehousing.orderNo,
-              prodAttrIds: this.form.prodAttrIds.join(','),
+              warehouseInProdAttrIds: this.form.warehouseInProdAttrIds.join(','),
               orderWarehouseInItemDoList: this.form1.table.map(e => {
                 return {
                   ...e,
@@ -821,7 +854,7 @@ export default {
           })
         })
       } else {
-        if (this.form.prodAttrIds.indexOf(4) !== -1) {
+        if (this.form.warehouseInProdAttrIds.indexOf(4) !== -1) {
           return this.$notify({
             title: this.$t('提示'),
             message: this.$t("订单包含不接受货物，请检查"),
@@ -845,7 +878,7 @@ export default {
                 volume: (+this.warehousing.volume)?.toFixed(2) || '',
                 weight: (+this.warehousing.weight)?.toFixed(2) || '',
                 prodId: this.form.prodId,
-                prodAttrIds: this.form.prodAttrIds.join(','),
+                warehouseInProdAttrIds: this.form.warehouseInProdAttrIds.join(','),
                 "orderWarehouseInUpdateItemDoList": this.form.table.map(e => {
                   return {
                     ...e,
@@ -871,7 +904,7 @@ export default {
                 orderItemId: this.warehousing.orderItemId,
                 orderNo: this.warehousing.orderNo,
                 isAppend: this.isAdd ? true : undefined,
-                prodAttrIds: this.form.prodAttrIds.join(','),
+                warehouseInProdAttrIds: this.form.warehouseInProdAttrIds.join(','),
                 orderWarehouseInItemDoList: this.form.table.map(e => {
                   return {
                     ...e,
@@ -910,13 +943,13 @@ export default {
       this.form.prodTitleZh = product.titleZh
       this.form.prodTitleEn = product.titleEn
       this.handleBrandChange(parseInt(this.form.brand))
-      this.form.prodAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []
+      this.form.warehouseInProdAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []
     },
     onProductChange1(product){
       this.form1.prodTitleZh = product.titleZh
       this.form1.prodTitleEn = product.titleEn
       this.handleBrandChange(parseInt(this.form1.brand))
-      this.form1.prodAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []
+      this.form1.warehouseInProdAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []
     },
     getProductBrandPage(titleZh = undefined) {
       getProductBrankPage({pageSize: 20, titleZh}).then(r => {
@@ -1010,10 +1043,10 @@ export default {
           this.$modal.msgSuccess(this.$t("新增成功"))
           if (this.activeName === 'first') {
             this.form.prodId = response.data
-            this.form.prodAttrIds = this.productForm.attrArray
+            this.form.warehouseInProdAttrIds = this.productForm.attrArray
           } else {
             this.form1.prodId = response.data
-            this.form1.prodAttrIds = this.productForm.attrArray
+            this.form1.warehouseInProdAttrIds = this.productForm.attrArray
           }
           this.productCancel()
         })