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

src/views/ecw/box/indexSeaAir.vue

@@ -135,6 +135,12 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
+        <el-form-item label="运输方式" prop="transportType">
+          <el-radio-group v-model="form.transportType">
+            <el-radio v-for="dict in transportTypes" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
         <el-form-item label="出货渠道" prop="shippingChannelId">
           <el-select v-model="form.shippingChannelId" placeholder="请选择出货渠道">
             <el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId" :key="item.channelId"></el-option>
@@ -221,7 +227,7 @@
         channelList:[],
         warehouseList: [],
         // 表单参数
-        form: {},
+        form: {transportType:"4"},
         // 表单校验
         rules: {
           shippingChannelId: [{ required: true, message: "出货渠道不能为空", trigger: "blur" }],
@@ -266,6 +272,9 @@
 
     },
     created() {
+      this.transportTypes = this.getDictDatas(
+      this.DICT_TYPE.ECW_TRANSPORT_TYPE
+    ).filter((item) => item.value == "4");
       getWarehouseList().then(res => this.warehouseList = res.data);
       getCabinetPage(null).then(response => {
         this.cabinetList = response.data.list;
@@ -305,7 +314,7 @@
           cabinetId: undefined,
           startWarehouseId: undefined,
           destWarehouseId: undefined,
-          transportType: undefined,
+          transportType: "4",
         };
         this.resetForm("form");
       },

src/views/ecw/customer/index.vue

@@ -683,6 +683,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
+
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;

src/views/ecw/order/special/discount.vue

@@ -35,7 +35,7 @@
              </el-input>
            </el-form-item>
            <el-form-item label="新运费" required style="width: 400px">
-             <el-input v-model="form.freight" type="number">
+             <el-input v-model="form.freight" type="number" class="input-with-select">
                <el-select v-model="form.freightCurrency" placeholder="请选择" slot="prepend" style="width: 100px">
                  <el-option
                    v-for="item in currencyList"
@@ -55,7 +55,7 @@
              </el-input>
            </el-form-item>
            <el-form-item label="新清关费" required style="width: 400px">
-             <el-input v-model="form.clearanceFreight" type="number">
+             <el-input v-model="form.clearanceFreight" type="number" class="input-with-select">
                <el-select v-model="form.clearanceFreightCurrency" placeholder="请选择" slot="prepend" style="width: 100px">
                  <el-option
                    v-for="item in currencyList"
@@ -286,6 +286,10 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+::v-deep .input-with-select {
+  .el-input-group__prepend, .el-input-group__append {
+    background-color: #fff;
+  }
+}
 </style>

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

@@ -36,6 +36,7 @@
               体积：{{ row.warehouseInInfoVO.volume }}m³<br>
               重量：{{ row.warehouseInInfoVO.weight }}Kg
             </template>
+            <span v-else>展示没有入库信息</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -87,9 +88,9 @@
       </el-table>
 
       <div style="text-align: center;margin-top: 80px">
-        <el-button type="primary" @click="toweight">申请重货优惠</el-button>
-        <el-button type="primary" @click="tolight" >申请泡货优惠</el-button>
-        <el-button type="primary">关闭窗口</el-button>
+        <el-button type="primary" @click="toweight" v-if="hasWarehouseInInfo && order.transportId === 1">申请重货优惠</el-button>
+        <el-button type="primary" @click="tolight" v-if="hasWarehouseInInfo && order.transportId === 2">申请泡货优惠</el-button>
+        <el-button type="primary" @click="$tab.closePage()">关闭窗口</el-button>
       </div>
     </el-card>
   </div>
@@ -133,6 +134,7 @@ export default {
       unitList:[],
       currencyList:[],
       productAttrList:[],
+      hasWarehouseInInfo: false
     };
   },
   created() {
@@ -150,6 +152,11 @@ export default {
       getOrder(this.orderId).then(response => {
         this.loading = false
         this.order = response.data
+        this.order.orderItemVOList.forEach(e => {
+          if (e.warehouseInInfoVO){
+            this.hasWarehouseInInfo = true
+          }
+        })
       })
     },
     toweight(){

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

@@ -6,7 +6,7 @@
       width="1080px"
     >
       <el-tabs v-model="activeName" type="card" @tab-click="handleTabs">
-        <el-tab-pane label="货物入仓" name="first">
+        <el-tab-pane :label="edit ? '货物修改' : '货物入仓'" name="first">
           <el-descriptions border :column="2">
             <el-descriptions-item label="中文品名">{{ warehousing.prodTitleZh }}</el-descriptions-item>
             <el-descriptions-item label="英文品名">{{ warehousing.prodTitleEn }}</el-descriptions-item>
@@ -138,7 +138,7 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="添加新品名" name="second">
+        <el-tab-pane label="添加新品名" name="second" v-if="!edit">
           <el-descriptions border :column="2">
             <el-descriptions-item label="中文品名">
               <product-selector v-model="form1.prodId" @change="onProductChange"/>
@@ -278,7 +278,7 @@
 
       <span slot="footer">
         <el-button @click="opened = false">关 闭</el-button>
-        <el-button type="primary" @click="handleSubmit()">提 交</el-button>
+        <el-button type="primary" @click="handleSubmit()">{{ edit ? '确认修改' : '提 交' }}</el-button>
       </span>
     </el-dialog>
   </div>

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

@@ -258,18 +258,37 @@ export default {
         this.getTowSum()
       })
     },
-    handleSubmit() {
+    specialHas0(){
+      let result = false
+      this.form.orderSpecialNeedReceivableReqVoList.forEach(e => {
+        if (e.receivableMoney === '0' || e.receivableMoney === ''){
+          result = true
+        }
+      })
+      return result
+    },
+    async handleSubmit() {
+      if (this.specialHas0()) {
+        const confirm = await this.$confirm('有特需费用为0或未填写，请问是否继续？', '注意', {
+          confirmButtonText: '继续',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+        if (confirm !== 'confirm'){
+          return
+        }
+      }
       let p = {
         orderSpecialNeedReceivableReqVoList: this.form.orderSpecialNeedReceivableReqVoList,
         "orderLocationCreateReqVOList": this.form.orderLocationCreateReqVOList,
         "orderId": this.order.orderId,
         urls: this.form.urls
       }
-       if(this.escapeBol){
-         p.exceptionUrls = this.form.exceptionUrls.split(',');
-         p.descZh = this.form.descZh;
-         p.manualExceptionType = this.form.manualExceptionType
-       }
+      if (this.escapeBol) {
+        p.exceptionUrls = this.form.exceptionUrls.split(',');
+        p.descZh = this.form.descZh;
+        p.manualExceptionType = this.form.manualExceptionType
+      }
       orderWarehouseInFinish(p).then(r => {
         if (r.code === 0) {
           this.escapeBol = false;

src/views/system/internalMessage/index.vue

@@ -3,9 +3,9 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-     <el-form-item label="来源" prop="fromId">
-     <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>
-    </el-form-item>
+<!--     <el-form-item label="来源" prop="fromId">-->
+<!--     <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>-->
+<!--    </el-form-item>-->
       <el-form-item label="发送时间">
         <el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -19,10 +19,10 @@
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
+<!--      <el-form-item label="创建时间">-->
+<!--        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"-->
+<!--                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -45,7 +45,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="来源" align="center" prop="fromId" />
+<!--      <el-table-column label="来源" align="center" prop="fromId" />-->
       <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sendTime) }}</span>
@@ -58,11 +58,11 @@
           <dict-tag :type="DICT_TYPE.INTERNAL_MESSAGE_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.createTime) }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -79,9 +79,9 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="来源" prop="fromId">
-         <el-input v-model="form.fromId" placeholder="请输入站内信来源" />
-       </el-form-item>
+<!--        <el-form-item label="来源" prop="fromId">-->
+<!--         <el-input v-model="form.fromId" placeholder="请输入站内信来源" />-->
+<!--       </el-form-item>-->
         <el-form-item label="发送时间" prop="sendTime">
           <el-date-picker clearable v-model="form.sendTime" type="date" value-format="yyyy-MM-dd" placeholder="选择发送时间" />
         </el-form-item>