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

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

@@ -122,9 +122,8 @@
               <product-selector lang="En" v-model="form1.prodId" @change="onProductChange"/>
             </el-descriptions-item>
             <el-descriptions-item label="品牌">
-              <span v-if="warehousing.orderWarehouseInBackItemDoList && warehousing.orderWarehouseInBackItemDoList.length">{{ form1.brand ? brand1 : '无' }}</span>
               <el-select
-                v-else v-model="form1.brand"
+                v-model="form1.brand"
                 placeholder="可修改"
                 filterable
                 @change="handleBrandChange"
@@ -373,6 +372,13 @@ export default {
       } else {
         this.$emit('update:visible', false)
       }
+    },
+    warehousing(newVal, oldVal){
+      if(newVal.orderItemId !== oldVal.orderItemId){
+        this.form.orderWarehouseInItemDoList = []
+        this.form1.orderWarehouseInItemDoList = []
+        this.activeName = 'first'
+      }
     }
   },
 
@@ -477,11 +483,19 @@ export default {
       (val === 1 ? this.form1 : this.form).orderWarehouseInItemDoList.pop()
     },
     handleAdd(val) {
+      let cartonsNum = '';
+      if (val !== 1) {
+        let hasCartonsNum = 0
+        this.tableData.forEach(e => {
+          hasCartonsNum += e.cartonsNum
+        })
+        cartonsNum = this.warehousing.num - hasCartonsNum
+      }
       (val === 1 ? this.form1 : this.form).orderWarehouseInItemDoList.push({
         "boxGauge1": "",
         "boxGauge2": "",
         "boxGauge3": "",
-        "cartonsNum": "",
+        "cartonsNum": cartonsNum > 0 ? cartonsNum : '',
         "expressNo": "",
         "quantityAll": "",
         "unit": "package",
@@ -550,15 +564,6 @@ export default {
         }
       }
       return ''
-    },
-    brand1(){
-      if (!!this.form1.brand){
-        const brand = this.brandList.find(e => e.id === this.form1.brand)
-        if (brand) {
-          return brand.titleZh
-        }
-      }
-      return ''
     }
   }
 }

src/views/index.vue

@@ -22,6 +22,7 @@
       <work-flow xmlkey="free_apply" v-model="selectedUsers"  />
       <div>选择的用户：{{selectedUsers}}</div>
     </el-card>
+
     <el-row>
       <my-process-viewer key="designer" v-model="bpmnXML" v-bind="bpmnControlForm" />
     </el-row>
@@ -109,7 +110,7 @@ export default {
   },
   created() {
     this.handlerBpm();
-    
+
   },
   methods: {
     handleSetLineChartData(type) {

src/views/system/notice/index.vue

@@ -9,7 +9,7 @@
       </el-form-item>
       <el-form-item label="类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="公告类型" clearable>
-          <el-option v-for="dict in noticeTypeDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+          <el-option v-for="dict in noticeTypeDictDatas" :key="parseInt(dict.value)" :label="$l(dict, 'label')" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -39,14 +39,19 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+      <el-table-column label="有效日期" align="center" prop="validateDate" width="150" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.validateDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<!--      <el-table-column label="创建者" align="center" prop="createBy"  width="150"/>-->
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="150">
         <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+        <template slot-scope="scope" >
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:notice:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -67,6 +72,11 @@
               <el-input v-model="form.title" placeholder="请输入公告标题" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="标题英文" prop="title">
+              <el-input v-model="form.titleEn" placeholder="请输入标题英文" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="公告类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择">
@@ -79,7 +89,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
                 <el-radio
@@ -90,11 +100,23 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="有效日期">
+              <el-date-picker type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" :editable="false"
+                              v-model="form.validateDate"
+                              style="width: 100%;"></el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="内容">
               <editor v-model="form.content" :min-height="192"/>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="内容英文">
+              <editor v-model="form.contentEn" :min-height="192"/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -181,8 +203,10 @@ export default {
       this.form = {
         id: undefined,
         title: undefined,
+        titleEn: undefined,
         type: undefined,
         content: undefined,
+        contentEn: undefined,
         status: CommonStatusEnum.ENABLE
       };
       this.resetForm("form");