Merge remote-tracking branch 'origin/release' into release

src/api/system/user.js

@@ -159,3 +159,11 @@ export function importTemplate() {
     responseType: 'blob'
   })
 }
+//新客户变老客户
+export function customerUpdateCustomerToOld(data){
+  return request({
+    url:'/ecw/customer/update-customer-to-old',
+    method:'put',
+    params:data
+  })
+}

src/views/ecw/box/shippingAir/utils.js

@@ -1158,7 +1158,7 @@ function getColmnMapping() {
         type: "date",
       },
       {
-        title: i18n.$t("卸货时间"),
+        title: i18n.$t("到仓通过时间"),
         key: "ulBoxTime",
         type: "date",
       },

src/views/ecw/box/shippingSea/nodePage/unloading/index.vue

@@ -9,9 +9,6 @@
       <el-form-item :label="$t('到仓时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="unloadingObj.ulWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('卸柜时间')" prop="ulBoxTime" :rules="[{ required: true, message: this.$t('必填'), trigger: 'blue' }]">
-        <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="unloadingObj.ulBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-      </el-form-item>
     </el-form>
 
     <el-row class="operate-button">

src/views/ecw/box/shippingSea/utils.js

@@ -1151,7 +1151,7 @@ function getColmnMapping() {
         type: "date",
       },
       {
-        title: i18n.$t("卸货时间"),
+        title: i18n.$t("卸柜通过时间"),
         key: "ulBoxTime",
         type: "date",
       },

src/views/ecw/zhongPao/index.vue

@@ -60,11 +60,19 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('创建人')" prop="creatorName" ></el-table-column>
+      <el-table-column :label="$t('更新人')" prop="updaterName" ></el-table-column>
+      <el-table-column :label="$t('更新时间')">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('状态')" align="center" prop="transportTypes">
         <template v-slot="scope">
           <el-switch v-model="scope.row.status" @change="handleStatusChange(scope.row)" :active-value="0" :inactive-value="1"></el-switch>
         </template>
       </el-table-column>
+
       <el-table-column :label="$t('操作')" 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)"
@@ -297,7 +305,7 @@ export default {
         }
         // 添加的提交
         // console.log(this.form);
-        
+
         createZhongPao(this.form).then(response => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;