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

src/components/Selector/index.vue

@@ -7,7 +7,7 @@
 export default {
     data(){
         return {
-            valueSync: null
+            valueSync: undefined
         }
     },
     props:{
@@ -47,10 +47,12 @@ export default {
     },
     watch:{
         valueSync(val){
-            this.$emit('input', val)
+          console.log('valueSync变化', val, this.value)
+          this.$emit('input', val)
         },
         value(value){
-            this.valueSync = value
+          console.log('value传值变化', value, this.valueSync)
+            if(value !== undefined)this.valueSync = value
         },
         optionsFormated(){
             this.setDefault()
@@ -77,4 +79,4 @@ export default {
         }
     }
 }
-</script>
\ No newline at end of file
+</script>

src/views/ecw/order/index.vue

@@ -896,7 +896,12 @@ export default {
       }else if(this.dept){
         func = orderDeptStatistics
       }
-      func(this.combinedQueryParams).then(res => {
+      const query = {...this.combinedQueryParams}
+      if(query.packageTypeArr && query.packageTypeArr.length){
+        query.packageType = query.packageTypeArr.join(',')
+        delete query.packageTypeArr
+      }
+      func(query).then(res => {
         this.statistics = res.data
       })
     },

src/views/ecw/order/stocking/components/Package.vue

@@ -52,18 +52,25 @@
         </el-descriptions-item>
       </el-descriptions>
       <el-row>
-        <el-col :span="8">
+        <el-col :span="4">
           <el-form-item :label="$t('材质')" style="margin-top: 20px">
             <dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="orderItemB.material" clearable></dict-tag>
           </el-form-item>
         </el-col>
-        <el-col :span="16">
+        <el-col :span="12">
           <el-form-item :label="$t('入仓特性')" style="margin-top: 20px">
             <el-checkbox-group v-model="form.warehouseInProdAttrIds" disabled>
               <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-col :span="8">
+					<el-form-item :label="$t('用途')" style="margin-top: 20px">
+						<el-checkbox-group v-model="form.usageIds" disabled>
+							<el-checkbox v-for="item in getDictDatas(DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE)" :key="item.value" :label="item.value">{{ $l(item, 'label') }}</el-checkbox>
+						</el-checkbox-group>
+					</el-form-item>
+				</el-col>
       </el-row>
       <!--<el-form-item :label="$t('入仓时间')" v-if="!edit">
         {{form.inTime}}
@@ -461,6 +468,7 @@ export default {
       this.form.prodType = this.warehousing.prodType
       this.form.type = this.warehousing.type
       this.form.feeType = this.warehousing.feeType
+      this.form.usageIds = this.warehousing.usageIds?.split(',')
 
       this.warehousing.orderWarehouseInBackItemDoList.forEach(e => {
         let bg = {}