入仓主 品牌

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

@@ -7,10 +7,25 @@
       width="960px"
     >
       <el-descriptions border :column="2">
-        <el-descriptions-item label="中文品名"></el-descriptions-item>
-        <el-descriptions-item label="英文品名"></el-descriptions-item>
-        <el-descriptions-item label="品牌">{{['无牌', '有牌', '中性'][warehousing.brandType]}}</el-descriptions-item>
-        <el-descriptions-item label="是否备案"></el-descriptions-item>
+        <el-descriptions-item label="中文品名">{{ warehousing.prodTitleZh }}</el-descriptions-item>
+        <el-descriptions-item label="英文品名">{{ warehousing.prodTitleEn }}</el-descriptions-item>
+        <el-descriptions-item label="品牌">
+          <span v-if="warehousing.orderWarehouseInBackItemDoList && warehousing.orderWarehouseInBackItemDoList.length">{{ brand }}</span>
+          <el-select
+            v-else v-model="form.brand"
+            placeholder="可修改"
+            filterable
+            @change="handleChangeBrand"
+            allow-create>
+            <el-option
+              v-for="item in brandList"
+              :key="item.id"
+              :label="item.titleZh"
+              :value="item.titleZh">
+            </el-option>
+          </el-select>
+        </el-descriptions-item>
+        <el-descriptions-item label="是否备案">{{ isBeian }}</el-descriptions-item>
         <el-descriptions-item label="填单参数"></el-descriptions-item>
       </el-descriptions>
       <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
@@ -35,12 +50,14 @@
             <template v-slot="{r,c,$index}">
               <span v-if="tableData[$index].id">{{ tableData[$index].cartonsNum }}</span>
               <el-input v-else v-model="tableData[$index].cartonsNum" placeholder=""></el-input>
+              <span>{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].boxGauge) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="包装类型">
             <template v-slot="{r,c,$index}">
-              <span v-if="tableData[$index].id">{{ tableData[$index].boxGauge }}</span>
-              <el-input v-else v-model="tableData[$index].boxGauge" placeholder=""></el-input>
+              <span v-if="tableData[$index].id">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].boxGauge) }}</span>
+<!--              <el-input v-else v-model="tableData[$index].boxGauge" placeholder=""></el-input>-->
+              <dict-selector v-else :type="DICT_TYPE.ECW_PACKAGE_TYPE" v-model="tableData[$index].boxGauge"></dict-selector>
             </template>
           </el-table-column>
           <el-table-column label="长(cm)">
@@ -48,7 +65,7 @@
 <!--              <el-input v-model="tableData[$index].cartonsNum" placeholder=""></el-input>-->
 <!--            </template>-->
           </el-table-column>
-          <el-table-column label="款(cm)">
+          <el-table-column label="宽(cm)">
 <!--            <template v-slot="{r,c,$index}">-->
 <!--              <el-input v-model="tableData[$index].cartonsNum" placeholder=""></el-input>-->
 <!--            </template>-->
@@ -95,9 +112,10 @@
 
 <script>
 import dictSelector from "@/components/DictSelector"
-import {DICT_TYPE} from "@/utils/dict"
+import {DICT_TYPE, getDictDataLabel} from "@/utils/dict"
 import warehousing from "@/views/ecw/order/warehousing"
 import {orderWarehouseIn} from "@/api/ecw/order"
+import {getProductBrankPage} from "@/api/ecw/productBrank"
 
 export default {
   name: 'editDialog',
@@ -124,12 +142,18 @@ export default {
   },
 
   mounted() {
+    getProductBrankPage({pageSize: 100000}).then(r => {
+      this.brandList = r.data.list
+    })
   },
 
   data() {
     return {
       DICT_TYPE,
+      getDictDataLabel,
       opened: false,
+      brandList: [],
+      isBeian: '无备案',
       form: {
         "brand": "",
         "brandType": 0,
@@ -171,6 +195,13 @@ export default {
   },
 
   methods: {
+    handleChangeBrand(b){
+      if (this.brandList.find(e => e.titleZh === b)){
+        this.isBeian = '有备案'
+      } else {
+        this.isBeian = '无备案'
+      }
+    },
     handleSubmit() {
       // Promise.all(
       //   this.form.orderWarehouseInItemDoList.map(e => {
@@ -191,6 +222,7 @@ export default {
         ...this.form,
         inTime: this.form.inTime,
         material: this.form.material,
+        brand: this.brand,
         brandType: this.warehousing.brandType,
         orderId: this.warehousing.orderId,
         orderItemId: this.warehousing.orderItemId,
@@ -227,6 +259,10 @@ export default {
   computed: {
     tableData() {
       return [...this.warehousing.orderWarehouseInBackItemDoList, ...this.form.orderWarehouseInItemDoList]
+    },
+    brand(){
+      const brand = this.brandList.find(e => e.titleZh === this.form.brand)
+      return brand?.titleZh || '无'
     }
   }
 }

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

@@ -5,7 +5,7 @@
     <order-base-info :order="order"></order-base-info>
 
     <div style="margin-top: 20px">
-      <span>储位：</span><el-button type="primary" size="mini" @click="areaVisible = true">选择</el-button>
+      <span>储位：{{ locationName }}</span><el-button type="primary" size="mini" @click="areaVisible = true" style="margin-left: 15px">选择</el-button>
     </div>
 
     <h2>货物信息</h2>
@@ -44,8 +44,11 @@
         label="快递单号">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="updateTime"
         label="最后操作时间">
+        <template v-slot="{row}">
+          {{ row.updateTime }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="address"
@@ -55,8 +58,8 @@
         prop="address"
         label="操作">
         <template v-slot="{ row, column, $index }">
-          <el-button v-if="orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0" size="mini" type="text" @click="handleWarehousing($index)">入仓</el-button>
-          <el-button v-else size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
+          <el-button v-if="orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0" size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
+          <el-button v-else size="mini" type="text" @click="handleWarehousing($index)">入仓</el-button>
           <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">退仓</el-button>
         </template>
       </el-table-column>
@@ -166,7 +169,7 @@
       width="300px">
       <div style="text-align: center">在完成入仓前，您还可以</div>
       <div style="text-align: center;padding: 15px 0">
-        <el-button type="info" @click="areaVisible = true, finishVisible = false">选择储位</el-button>
+        <el-button type="info" @click="areaVisible = true">选择储位</el-button>
         <el-button type="info">打印标签</el-button>
       </div>
       <div style="text-align: center">