Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/ecw/order.js

@@ -719,3 +719,12 @@ export  function cancelSplitRevoke(data){
   })
 }
 
+/*修改拆单项*/
+export function splitItemUpdate(data){
+  return request({
+    url: '/order/split-item/update',
+    method: 'post',
+    data
+  })
+}
+

src/api/ecw/product.js

@@ -9,6 +9,15 @@ export function createProduct(data) {
   })
 }
 
+// 创建产品
+export function addProduct(data) {
+  return request({
+    url: '/ecw/product/add',
+    method: 'post',
+    data: data
+  })
+}
+
 // 更新产品
 export function updateProduct(data) {
   return request({

src/components/ProductSelector/index.vue

@@ -14,8 +14,12 @@
         <el-option
         v-for="(item, index) in list"
         :key="item.id"
-        :label="item['title' + lang] + (item.auditStatus === 2 ? '' : `(${$t('审核中')})`)"
+        :label="item['title' + lang] + (item.auditStatus === 2 ? '' : `(${lang === 'Zh' ? '待确定' : 'To be determined'})`)"
         :value="index">
+          <span style="float: left">{{ item['title' + lang] }}</span>
+          <span style="float: right; color: #c76e6e; font-size: 13px">
+            {{ item.auditStatus === 2 ? '' : (lang === 'Zh' ? '待确定' : 'To be determined') }}
+          </span>
         </el-option>
     </el-select>
 </template>
@@ -80,7 +84,8 @@ export default {
         },
         remoteMethod(keyword){
             let params = {
-                pageSize: keyword ? 100000 : 10
+                pageSize: keyword ? 100000 : 10,
+                filter: false
             }
             if(this.productType){
                 params.typeId = this.productType

src/views/ecw/box/ladingBill/index.vue

@@ -9,7 +9,22 @@
     <el-row style="margin-top:15px">
       <el-table :data="billData.list" border max-height="500px">
         <el-table-column :label="$t('序号')" align="center" width="50" prop="tidanNo" />
-        <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
+        <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.orderNo}}
+            </div>
+            <div style="color:blue;fontWeight:bold;">
+              {{ scope.row.drawee? scope.row.drawee:''}}
+            </div>
+            <div style="color:red;fontWeight:bold;">
+              {{ scope.row.applicationInfo? scope.row.applicationInfo : ''}}
+            </div>
+            <div style="color:red;fontWeight:bold;">
+              {{ scope.row.customsTypeName? scope.row.customsTypeName : ''}}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('货物信息')" align="center" prop="">
           <template slot-scope="scope">
             <section class="table-goodList">

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -138,14 +138,32 @@
               <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
             </template>
           </el-table-column>
-          <el-table-column :label="$t('体积')" align="center">
+          <el-table-column :label="$t('入仓体积')" align="center" >
             <template slot-scope="scope">
-              <span>{{scope.row.volume}}m³</span>
+              <el-input v-model="scope.row.volume" @change="updateField(scope.row, 'volume')" size="mini" :disabled="index === 0">
+                <span slot="append">m³</span>
+              </el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('重量')" align="center">
+          <el-table-column :label="$t('收费体积')" align="center" >
             <template slot-scope="scope">
-              <span>{{scope.row.weight}}kg</span>
+              <el-input v-model="scope.row.chargeVolume" @change="updateField(scope.row, 'chargeVolume')" size="mini" :disabled="index === 0">
+                <span slot="append">m³</span>
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('入仓重量')" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.weight" @change="updateField(scope.row, 'weight')" size="mini" :disabled="index === 0">
+                <span slot="append">kg</span>
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('收费重量')" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.chargeWeight" @change="updateField(scope.row, 'chargeWeight')" size="mini" :disabled="index === 0">
+                <span slot="append">kg</span>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center">
@@ -208,6 +226,18 @@
           <el-form-item :label="$t('放入箱数')+'：'">
             {{shopForm.putNum||0}}
           </el-form-item>
+          <el-form-item :label="$t('入仓体积')">
+            <el-input-number v-model="shopForm.volume" controls-position="right"  :min="0" :max="orderItem.warehouseInInfoVO.volume"></el-input-number>
+          </el-form-item>
+          <el-form-item :label="$t('收费体积')">
+            <el-input-number v-model="shopForm.chargeVolume" controls-position="right"  :min="0" :max="orderItem.chargeVolume"></el-input-number>
+          </el-form-item>
+          <el-form-item :label="$t('入仓重量')">
+            <el-input-number v-model="shopForm.weight" controls-position="right"  :min="0" :max="orderItem.warehouseInInfoVO.weight"></el-input-number>
+          </el-form-item>
+          <el-form-item :label="$t('收费重量')">
+            <el-input-number v-model="shopForm.chargeWeight" controls-position="right"  :min="0" :max="orderItem.chargeWeight"></el-input-number>
+          </el-form-item>
           <!-- <el-form-item :label="$t('放入数量(个)')+'：'" prop="putQuantity" v-show="isQuantity">
             <el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
           </el-form-item> -->
@@ -233,7 +263,7 @@ import {
 } from "@/api/ecw/orderHandle";
 import { getTradeCityList } from "@/api/ecw/region";
 import WorkFlow from "@/components/WorkFlow";
-import { getOrder } from "@/api/ecw/order";
+import {getOrder, splitItemUpdate} from "@/api/ecw/order";
 import { serviceMsg, toReviewDetail } from "../../utils";
 import { createApproval, approvalCancel, splitList } from "@/api/ecw/boxSea";
 import Decimal from "decimal.js";
@@ -328,8 +358,26 @@ export default {
       }
       return false;
     },
+    // 订单项数据，默认要返回一个如下的空json结构体，避免报错
+    orderItem(){
+      if(!this.orderData) return {warehouseInInfoVO:{}}
+      return this.orderData.orderItemVOList.find(item => item.orderItemId == this.shopForm.orderItemId) || {warehouseInInfoVO:{}}
+    }
   },
   methods: {
+    /*检查并提交字段(体积，重量)修改*/
+    updateField(row, field){
+      let val = parseFloat(row[field])
+      if(!val || val < 0){
+        this.$message.error(this.$t('数据无效'))
+        return this.getList()
+      }
+      splitItemUpdate(row).then(() => {
+        this.$message.success(this.$t('修改成功'))
+      }).catch(() => {
+        this.getList()
+      })
+    },
     /* 拆箱总数 */
     totalSplitNum() {
       let _total = 0;
@@ -565,6 +613,10 @@ export default {
             orderItemId: this.shopForm.orderItemId,
             orderSplitId: this.splitData.id,
             remarks: this.shopForm.remarks,
+            volume: this.shopForm.volume,
+            weight: this.shopForm.weight,
+            chargeWeight: this.shopForm.chargeWeight,
+            chargeVolume: this.shopForm.chargeVolume
           };
           createSplitItem(params).then((res) => {
             this.$message.success(this.$t("放入成功"));

src/views/ecw/customer/edit.vue

@@ -17,6 +17,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('客户英文名称')">
+                <el-input v-model="form.nameEn" :placeholder="$t('请输入客户英文名称')"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('付款人姓名')">
+                <el-input v-model="form.payerName" :placeholder="$t('请输入付款人姓名')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('客户等级')" prop="level">
                 <el-select v-model="form.level" :placeholder="$t('请选择客户等级')" disabled>
@@ -70,7 +80,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-
               <el-form-item :label="$t('客户生日')" prop="birthday">
                 <el-date-picker
                   v-model="form.birthday"
@@ -80,6 +89,11 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('公司英文名称')">
+                <el-input v-model="form.companyEn" :placeholder="$t('请输入客户英文名称')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('主营类别')" prop="productType">
                 <el-row :gutter="10">
@@ -268,6 +282,16 @@
                   </el-form-item>
                 </template>
               </el-table-column>
+              <el-table-column>
+                <template slot="header">
+                  {{$t('联系人英文名称')}}
+                </template>
+                <template v-slot="{row, cellValue, $index}">
+                  <el-form-item label="">
+                    <el-input v-model="row.nameEn" :placeholder="$t('请输入联系人英文名称')" size="mini"/>
+                  </el-form-item>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="areaCode"
                 :label="$t('区号')"
@@ -873,12 +897,15 @@ export default {
         id: undefined,
         number: undefined,
         name: undefined,
+        nameEn: undefined,
         level: 1,
         country: undefined,
         type: undefined,
         transportType:[],
         agentId: undefined,
         company: undefined,
+        companyEn: undefined,
+        payerName:undefined,
         address: undefined,
         productType: undefined,
         productId: undefined,
@@ -948,6 +975,7 @@ export default {
         "social": undefined,
         "socialNumber": "",
         "userid": undefined,
+         "nameEn":"",
         // "username": ""
       })
     },

src/views/ecw/customer/index.vue

@@ -105,7 +105,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name">
         <template slot-scope="{row}">
-          {{row.name}} <el-tag v-if="row.isInOpenSea" size="mini">{{ $t('公') }}</el-tag>
+          {{$l(row, 'name')}} <el-tag v-if="row.isInOpenSea" size="mini">{{ $t('公') }}</el-tag>
         </template>
       </el-table-column>
 

src/views/ecw/customer/indirectCustomer.vue

@@ -44,7 +44,7 @@
       <el-table-column :label="$t('客户名称')" align="center" prop="name" >
         <template v-slot="scope">
         <router-link :to="{path: '/customer/indirectInfo',query: {id: scope.row.id}}" class="link-type">
-          <span>{{ scope.row.name }}</span>
+          <span>{{ $l(scope.row,'name') }}</span>
         </router-link>
         </template>
       </el-table-column>

src/views/ecw/customer/query.vue

@@ -15,7 +15,7 @@
         <el-card style="margin-top: 15px;">
           <el-descriptions :column="4" border>
             <el-descriptions-item :label="$t('客户编号')">{{ customer.number }}</el-descriptions-item>
-            <el-descriptions-item :label="$t('客户名称')">{{ customer.name }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('客户名称')">{{ $l( customer, 'name') }}</el-descriptions-item>
             <el-descriptions-item :label="$t('结算方式')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_BALANCE, customer.balance) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户生日')">{{ parseTime(customer.birthday, '{y}-{m}-{d}') }}</el-descriptions-item>
             <el-descriptions-item :label="$t('出货渠道')">
@@ -77,6 +77,9 @@
               prop="name"
               :label="$t('联系人')"
             >
+               <template v-slot="{row}">
+                 {{$l(row, 'name')}}
+               </template>
             </el-table-column>
             <el-table-column
               prop="phoneNew"
@@ -231,6 +234,11 @@
 <!--                    <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" />-->
 <!--                  </template>-->
                 </el-table-column>
+                <el-table-column :label="$t('入仓时间')">
+                  <template v-slot="{row}">
+                    {{parseTime(row.rucangTime)}}
+                  </template>
+                </el-table-column>
                 </el-table>
               <pagination @pagination="getorderList" :page.sync="queryParams.page" :limit.sync="queryParams.rows"  :total="orderTotal" ></pagination>
             </el-card>

src/views/ecw/customerConfirm/index.vue

@@ -85,7 +85,11 @@
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="center" prop="name" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="name" >
+        <template v-slot="{row}">
+          {{$l(row, 'name')}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.level" />

src/views/ecw/customerToBeAssigned/index.vue

@@ -96,7 +96,11 @@
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="center" prop="name" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="name" >
+        <template v-slot="{row}">
+          {{$l(row, 'name')}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.level" />

src/views/ecw/myCustomerService/index.vue

@@ -85,7 +85,11 @@
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="center" prop="name" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="name" >
+        <template v-slot="{row}">
+          {{$l(row, 'name')}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.level" />

src/views/ecw/oceanCustomer/index.vue

@@ -90,7 +90,11 @@
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="center" prop="name" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="name" >
+        <template v-slot="{row}">
+          {{$l(row, 'name')}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.level" />

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

@@ -130,6 +130,16 @@
     <div>
       {{ FeeDetails.details && FeeDetails.details.reason ? FeeDetails.details.reason :''}}
     </div>
+    <p>{{$t('退仓图片')}}</p>
+    <div>
+      <el-image
+        v-for="(item, index) in (FeeDetails.details.imgUrl || '').split(',')"
+        :key = 'index'
+        style="width: 100px; height: 100px;margin:10px;"
+        :src="item"
+        :preview-src-list="(FeeDetails.details.imgUrl || '').split(',')">
+      </el-image>
+    </div>
   </div>
   <div v-if="type === 4">
     <p>{{ $t('申请理由') }}</p>

src/views/ecw/order/splitApply.vue

@@ -156,28 +156,28 @@
           </el-table-column>
           <el-table-column :label="$t('入仓体积')" align="center" >
             <template slot-scope="scope">
-                <el-input v-model="scope.row.volume" @change="updateField(scope.row, 'volume')" size="mini">
+                <el-input v-model="scope.row.volume" @change="updateField(scope.row, 'volume')" size="mini" :disabled="index === 0">
                   <span slot="append">m³</span>
                 </el-input>
               </template>
           </el-table-column>
           <el-table-column :label="$t('收费体积')" align="center" >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.chargeVolume" @change="updateField(scope.row, 'chargeVolume')" size="mini">
+              <el-input v-model="scope.row.chargeVolume" @change="updateField(scope.row, 'chargeVolume')" size="mini" :disabled="index === 0">
                 <span slot="append">m³</span>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column :label="$t('入仓重量')" align="center">
             <template slot-scope="scope">
-                <el-input v-model="scope.row.weight" @change="updateField(scope.row, 'weight')" size="mini">
+                <el-input v-model="scope.row.weight" @change="updateField(scope.row, 'weight')" size="mini" :disabled="index === 0">
                   <span slot="append">kg</span>
                 </el-input>
               </template>
             </el-table-column>
           <el-table-column :label="$t('收费重量')" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.chargeWeight" @change="updateField(scope.row, 'chargeWeight')" size="mini">
+              <el-input v-model="scope.row.chargeWeight" @change="updateField(scope.row, 'chargeWeight')" size="mini" :disabled="index === 0">
                 <span slot="append">kg</span>
               </el-input>
             </template>
@@ -297,7 +297,7 @@ import {getSplitList,splitApply,createSplit,cancelApply,createSplitItem,deleteSp
 import {getWarehouseList} from '@/api/ecw/warehouse'
 import {getChannelList} from '@/api/ecw/channel'
 import WorkFlow from '@/components/WorkFlow'
-import {getOrder} from '@/api/ecw/order'
+import {getOrder, splitItemUpdate} from '@/api/ecw/order'
 import Decimal from 'decimal.js'
 
 export default {
@@ -399,7 +399,7 @@ export default {
         this.$message.error(this.$t('数据无效'))
         return this.getList()
       }
-      createSplitItem(row).then(() => {
+      splitItemUpdate(row).then(() => {
         this.$message.success(this.$t('修改成功'))
       }).catch(() => {
         this.getList()

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

@@ -57,9 +57,20 @@
                 <span v-else>{{ warehousing.weight }}</span>Kg
               </el-descriptions-item>
             </el-descriptions>
+            <el-row>
+              <el-col :span="8">
                 <el-form-item :label="$t('材质')" style="margin-top: 20px">
                   <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.material" clearable></dict-selector>
                 </el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <el-form-item :label="$t('入仓特性')" style="margin-top: 20px">
+                  <el-checkbox-group v-model="form.prodAttrIds">
+                    <el-checkbox v-for="item in attrList" :key="item.id" :label="item.id">{{ item.attrName }}</el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-form-item :label="$t('入仓时间')" v-if="!edit">
               <el-date-picker v-model="form.inTime" type="datetime" :placeholder="$t('请选择入仓时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
@@ -240,9 +251,20 @@
               </el-descriptions-item>
               <el-descriptions-item :label="$t('填单参数')">{{ $t('非填单货物') }}</el-descriptions-item>
             </el-descriptions>
+            <el-row>
+              <el-col :span="8">
                 <el-form-item :label="$t('材质')" style="margin-top: 20px">
-              <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form1.material"></dict-selector>
+                  <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form1.material" clearable></dict-selector>
+                </el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <el-form-item :label="$t('入仓特性')" style="margin-top: 20px">
+                  <el-checkbox-group v-model="form1.prodAttrIds">
+                    <el-checkbox v-for="item in attrList" :key="item.id" :label="item.id">{{ item.attrName }}</el-checkbox>
+                  </el-checkbox-group>
                 </el-form-item>
+              </el-col>
+            </el-row>
             <el-form-item :label="$t('入仓时间')">
               <el-date-picker v-model="form1.inTime" type="datetime" :placeholder="$t('请选择入仓时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
@@ -451,7 +473,7 @@ import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict"
 import {orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api/ecw/order"
 import {getProductAttrList} from "@/api/ecw/productAttr"
 import {getProductTypeList} from "@/api/ecw/productType"
-import {createProduct} from "@/api/ecw/product"
+import {addProduct} from "@/api/ecw/product"
 
 export default {
   name: "Warehouse",
@@ -595,7 +617,7 @@ export default {
         inTime: undefined,
         material: undefined,
         orderItemId: undefined,
-        prodAttrIds: undefined,
+        prodAttrIds: [],
         prodId: undefined,
         prodTitleEn: undefined,
         prodTitleZh: undefined,
@@ -613,7 +635,7 @@ export default {
         inTime: undefined,
         material: undefined,
         orderItemId: undefined,
-        prodAttrIds: undefined,
+        prodAttrIds: [],
         prodId: undefined,
         prodTitleEn: undefined,
         prodTitleZh: undefined,
@@ -683,7 +705,7 @@ 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
+      this.form.prodAttrIds = 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
@@ -738,6 +760,13 @@ export default {
     handleSubmit() {
       if (this.activeName !== "first"){
         // 添加非填单货物
+        if (this.form1.prodAttrIds.indexOf(4) !== -1) {
+          return this.$notify({
+            title: this.$t('提示'),
+            message: this.$t("订单包含不接受货物，请检查"),
+            type: 'warning'
+          })
+        }
         this.$refs['form1'].validate(valid => {
           this.$refs['tableForm1'].validate(valid1 => {
             if (!valid || !valid1) {
@@ -749,6 +778,7 @@ export default {
               orderId: this.warehousing.orderId,
               orderItemId: undefined,
               orderNo: this.warehousing.orderNo,
+              prodAttrIds: this.form.prodAttrIds.join(','),
               orderWarehouseInItemDoList: this.form1.table.map(e => {
                 return {
                   ...e,
@@ -767,6 +797,13 @@ export default {
           })
         })
       } else {
+        if (this.form.prodAttrIds.indexOf(4) !== -1) {
+          return this.$notify({
+            title: this.$t('提示'),
+            message: this.$t("订单包含不接受货物，请检查"),
+            type: 'warning'
+          })
+        }
         this.$refs['form'].validate(valid => {
           this.$refs['tableForm'].validate(valid1 => {
             if (!valid || !valid1) {
@@ -784,6 +821,7 @@ export default {
                 volume: (+this.warehousing.volume)?.toFixed(2) || '',
                 weight: (+this.warehousing.weight)?.toFixed(2) || '',
                 prodId: this.form.prodId,
+                prodAttrIds: this.form.prodAttrIds.join(','),
                 "orderWarehouseInUpdateItemDoList": this.form.table.map(e => {
                   return {
                     ...e,
@@ -809,6 +847,7 @@ export default {
                 orderItemId: this.warehousing.orderItemId,
                 orderNo: this.warehousing.orderNo,
                 isAppend: this.isAdd ? true : undefined,
+                prodAttrIds: this.form.prodAttrIds.join(','),
                 orderWarehouseInItemDoList: this.form.table.map(e => {
                   return {
                     ...e,
@@ -934,7 +973,7 @@ export default {
         //商品特性转字符串
         this.productForm.attrId = this.productForm.attrArray.join(',')
         // 添加的提交
-        createProduct(this.productForm).then(response => {
+        addProduct(this.productForm).then(response => {
           this.$modal.msgSuccess(this.$t("新增成功"))
           if (this.activeName === 'first') {
             this.form.prodId = response.data

src/views/ecw/order/withdrawal.vue

@@ -13,6 +13,9 @@
         <el-form-item :label="$t('退仓原因')">
           <el-input v-model="params.reason" style="width:500px" type="textarea"></el-input>
         </el-form-item>
+        <el-form-item :label="$t('图片')">
+          <image-and-video-upload   :file-type="['png' , 'jpg', 'jpeg']" :fileSize="50" :isShowTip="true" v-model="params.imgUrl" ></image-and-video-upload>
+        </el-form-item>
       </el-form>
       <el-divider></el-divider>
       <h2>{{$t('审批流程')}}</h2>
@@ -37,6 +40,7 @@ import {
   warehouseApprovalCancel
 } from "@/api/ecw/batchSingleApplication";
 import workFlow from "@/components/WorkFlow";
+import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index.vue";
 
 export default {
   name: "withdrawal",
@@ -45,6 +49,7 @@ export default {
     dialogVisible:Boolean
   },
   components:{
+    ImageAndVideoUpload,
     workFlow
   },
   data(){
@@ -55,6 +60,7 @@ export default {
         orderNo:undefined,
         reason:'',
         copyUserId:[],
+        imgUrl:[]
       },
       isExamine:true,
       details:{},
@@ -82,6 +88,7 @@ export default {
     submit(){
       this.params.orderId =  this.orderDetails.orderId;
       this.params.orderNo =this.orderDetails.orderNo;
+      this.params.imgUrl =  this.params.imgUrl.join(',')
       orderWarehouseInDelete(this.params).then(r => {
        if(r.code === 0){
          this.$message.success(this.$t('退仓成功'));

src/views/ecw/product/index.vue

@@ -439,6 +439,7 @@ export default {
 	  params.filter=false;
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
+	  params.status = 0;
       getProductPage(params).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;