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

src/views/ecw/order/release.vue

@@ -22,7 +22,7 @@
             <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector>
           </el-form-item>
           <el-form-item :label="$t('提货时间')" v-if="form.pickType == 1">
-            <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            <el-date-picker v-model="form.pickTime" placeholder="" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
           </el-form-item>
 
           <template v-if="form.pickType == 2">

src/views/ecw/zhongPao/index.vue

@@ -194,10 +194,7 @@ export default {
     handleStatusChange(row){
       let text = row.status === CommonStatusEnum.ENABLE ? this.$t("启用") : this.$t("停用");
       this.$modal.confirm('确认要' + text + '吗?').then(function() {
-        return updateZhongPao({
-          id: row.id,
-          status: row.status
-        })
+        return updateZhongPao(row)
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {
@@ -207,7 +204,7 @@ export default {
     },
     departureFormatter(row, column, cellValue) {
       if (cellValue === 0) return this.$t('全部')
-      return this.warehouseList.find(e => e.id === cellValue)?.titleZh
+      return this.tradeCityList.find(e => e.id === cellValue)?.titleZh
     },
     objectiveFormatter(row, column, cellValue) {
       if (!cellValue || cellValue.length === 0) return ''