Merge remote-tracking branch 'origin/master'

src/views/modules/ecss/codelnotify.vue

@@ -13,10 +13,10 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="'发货通知单:'">
-        <el-input v-model="searchData.delNo"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.delNo" clearable  style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'CMC Invoice:'">
-        <el-input v-model="searchData.cmcInvoice"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.cmcInvoice" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'通知单状态:'">
         <el-select filterable v-model="searchData.notifyStatus" style="width: 120px">

src/views/modules/ecss/codelnotifyConfirm.vue

@@ -13,10 +13,10 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="'发货通知单:'">
-        <el-input v-model="searchData.delNo"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.delNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'CMC Invoice:'">
-        <el-input v-model="searchData.cmcInvoice"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.cmcInvoice" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'通知单状态:'">
         <el-select filterable v-model="searchData.notifyStatus" style="width: 120px">

src/views/modules/ecss/components/PackingDetailTab.vue

@@ -1129,7 +1129,7 @@ export default {
 
       // 数字类型格式化
       if (columnProp === 'qty' ) {
-        return parseInt(value).toLocaleString();
+        return value.toLocaleString();
       }
       if (columnProp === 'rolls') {
         return value.toFixed(3);

src/views/modules/ecss/createDeclaration.vue

@@ -13,10 +13,10 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="'发货通知单:'">
-        <el-input v-model="searchData.delNo"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.delNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'CMC Invoice:'">
-        <el-input v-model="searchData.cmcInvoice"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.cmcInvoice" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'ReadyDate'" >
         <el-date-picker

src/views/modules/ecss/declaration.vue

@@ -5,13 +5,13 @@
         <el-input v-model="searchData.site"  style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'报关单号:'">
-        <el-input v-model="searchData.declarationNo"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.declarationNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'发货通知单:'">
-        <el-input v-model="searchData.delNo"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.delNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'CMC Invoice:'">
-        <el-input v-model="searchData.cmcInvoice"  style="width: 120px"></el-input>
+        <el-input v-model="searchData.cmcInvoice" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'出口日期'" >
         <el-date-picker