出港业务总体优化

@@ -29,7 +29,8 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api':{
-          target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
+          // target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
+          target: 'http://localhost:12343',//设置你调用的接口域名和端口号 别忘了加http
           changeOrigin: true,
           pathRewrite: {
               '^/api': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可

@@ -8,7 +8,7 @@ export const deleteByIsDelete = params => { return http.del(`${baseUrl}/deleteBy
 
 export const updateStatus = params => { return http.put(`${baseUrl}/updateStatus`, params) };
 
-export const updateMT2201 = params => { return http.put(`${baseUrl}/updateMT2201`,params)};
+export const updateMT2201 = params => { return http.put(`${baseUrl}/updateMt2201`,params)};
 
 export const addMt2201 = params => { return http.post(`${baseUrl}/addMt2201`,params)};
 

@@ -29,12 +29,12 @@ export default {
     },
     limit: {
       type: Number,
-      default: 20
+      default: 100
     },
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [10, 20, 30, 50, 100]
       }
     },
     layout: {
@@ -92,7 +92,7 @@ export default {
 <style scoped>
 .pagination-container {
   background: #fff;
-  padding: 32px 16px;
+  /*padding: 32px 16px;*/
 }
 .pagination-container.hidden {
   display: none;

@@ -33,8 +33,8 @@ Vue.use(Vuex)
 Vue.prototype.$axios = axios;
 
 //NProgress.configure({ showSpinner: false });
-console.log("mainjs:");
-console.log(rout.routes);
+// console.log("mainjs:");
+// console.log(rout.routes);
 const router = new VueRouter({
     routes:rout.routes
 });
@@ -61,7 +61,7 @@ router.beforeEach((to, from, next) => {
   }
 });
 
-var message = Vue.prototype.$message;
+const message = Vue.prototype.$message;
 axios.defaults.baseURL = '/api';
 axios.interceptors.response.use(
     res => {

@@ -15,9 +15,9 @@ import ExitArrive from './views/nmms/ExitArrive.vue'
 import ExitManifest from './views/nmms/ExitManifest.vue'
 import ExitLoading from './views/nmms/ExitLoading.vue'
 import ExitFlightDesc from './views/nmms/ExitFlightDesc.vue'
-import LostLoadChange from './views/lostLoadChange/lostLoadChange.vue'
 import LostLoad from './views/lostLoadChange/lostLoading.vue'
-// import Form from './views/nav1/Form.vue'
+import LostLoadChange from './views/lostLoadChange/lostLoadChange.vue'
+
 
 import User from './views/nav1/user.vue'
 import Page4 from './views/nav2/Page4.vue'
@@ -77,8 +77,8 @@ let routes = [
         iconCls: 'el-icon-collection',
         children: [
             {path: '/flight', component: ExitFlight, name: '出港航班申报'},
-            {path: '/pre', component: ExitPre, name: '出港预配舱单'},
             {path: '/manifest', component: ExitManifest, name: '出港运单申报'},
+            {path: '/pre', component: ExitPre, name: '出港预配舱单'},
             {path: '/arrive', component: ExitArrive, name: '出港运抵'},
             {path: '/loadingView', component: ExitFlightDesc, name: '出港航班信息'},
             {path: '/loading', component: ExitLoading, name: '出港装载'},

@@ -43,7 +43,7 @@ export function validAlphabetsAndNum(str) {
 
 /* 大小写字母数字空格*/
 export function validAlphabetsAndSpanceKey(str) {
-  const reg = /^[0-9a-zA-Z ]+$/
+  const reg = /^[0-9a-zA-Z\s]+$/
   return reg.test(str)
 }
 
@@ -88,3 +88,14 @@ export function validEmail(email) {
   const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
   return re.test(email)
 }
+
+/**
+ *
+ * 整数和小数，小数最多两位
+ * @param value
+ * @returns {boolean}
+ */
+export function validatorNum(value) {
+  const reg = /^(\d*)+(\.[0-9]{1,2})?$/
+  return reg.test(value)
+}

@@ -60,7 +60,7 @@
                 <template slot-scope="scope">
                     <span v-if="scope.row.offload ==='001'">未落装</span>
                     <span v-if="scope.row.offload ==='002'">已落装</span>
-                    <span v-if="scope.row.offload ==='003'">以落装改配</span>
+                    <span v-if="scope.row.offload ==='003'">已落装改配</span>
                 </template>
             </el-table-column>
             <el-table-column label="状态" width="90px" align="center">

@@ -119,7 +119,7 @@
                     <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)"
                                :disabled="scope.row.status !=='00'">发送舱单报
                     </el-button>
-                    <el-button size="mini" type="danger" @click="handleAwbDelete(scope.row)">发删除报</el-button>
+                    <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
 
                     <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
                                :disabled="scope.row.status ==='00'">修改状态
@@ -288,7 +288,7 @@
 
     import {getMt3201ListForParam, deleteByIsDelete, updateStatus, updateMT3201, addMt3201} from '@/api/exitArrive'
     import {Message} from "element-ui";
-    import {validAwb, validAlphabets, validAlphabetsAndNum,validAlphabetsAndSpanceKey} from "@/utils/validate";
+    import {validAwb, validAlphabets, validAlphabetsAndNum,validAlphabetsAndSpanceKey,validatorNum} from "@/utils/validate";
     import {getResponseForParam} from '@/api/responseDetail'
 
     export default {
@@ -320,9 +320,16 @@
                 }
                 callback()
             }
+            const validatorNums = (rule, value, callback) => {
+                if (!validatorNum(value)) {
+                    callback("只能输入数字，并且小数位最多两位")
+                }
+                callback()
+            }
             return {
                 func: treeToArray,
                 total: 1,
+                isAdmin: false,
                 arriveQuery: {
                     pageSize: 1,
                     limitSize: 100,
@@ -353,8 +360,8 @@
                     flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}],
                     originstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
                     destinationstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
-                    piece: [{type: 'number', required: true, trigger: 'change', message: '只能输入数字'}],
-                    weight: [{type: 'number', required: true, trigger: 'change', message: '只能输入数字'}],
+                    weight: [{required: true, trigger: 'change', validator: validatorNums}],
+                    piece: [{required: true, trigger: 'change', validator: validatorNums}],
                 },
                 arriveData: [],
                 detailData: [],
@@ -389,6 +396,10 @@
                 this.arriveQuery.destinationstation = this.$route.params.flightData.destinationstation
                 this.getList()
             }
+            let username = JSON.parse(sessionStorage.getItem('user')).username
+            if(username === 'admin'){
+                this.isAdmin = true
+            }
         },
         computed: {
             awba: {

@@ -107,7 +107,7 @@
                         <el-button size="mini" type="primary" @click="handleSendAwb(scope.row)"
                                    :disabled="scope.row.status !=='00'">发送舱单报
                         </el-button>
-                        <el-button size="mini" type="danger" @click="handleAwbDelete(scope.row)">发删除报</el-button>
+                        <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
                         <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
                                    :disabled="scope.row.status ==='00'">更改状态
                         </el-button>
@@ -196,12 +196,12 @@
                     <el-row>
                         <el-col :span="7.5">
                             <el-form-item label="运单件数" prop="price">
-                                <el-input v-model.number="loadingModel.awbprice"></el-input>
+                                <el-input v-model="loadingModel.awbprice"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="7.5">
                             <el-form-item label="运单重量" prop="weight">
-                                <el-input v-model.number="loadingModel.awbweight"></el-input>
+                                <el-input v-model="loadingModel.awbweight"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="7.5">
@@ -211,7 +211,6 @@
                                                :value="item"></el-option>
                                 </el-select>
                             </el-form-item>
-
                         </el-col>
                     </el-row>
                     <el-row>
@@ -281,7 +280,7 @@
     import Pagination from '@/components/Pagination'
     import {getMt4201ListForParam, deleteByIsDelete, updateStatus, updateMT4201, addMt4201} from '@/api/exitLoading'
     import {Message} from "element-ui";
-    import {validAwb, validAlphabets, validAlphabetsAndNum, validAlphabetsAndSpanceKey} from "@/utils/validate"
+    import {validAwb, validAlphabets, validAlphabetsAndNum, validAlphabetsAndSpanceKey,validatorNum} from "@/utils/validate"
     export default {
         name: "ExitLoading",
         components: {treeTable, Pagination},
@@ -311,9 +310,16 @@
                 }
                 callback()
             }
+            const validatorNums = (rule, value, callback) => {
+                if (!validatorNum(value)) {
+                    callback("只能输入数字，并且小数位最多两位")
+                }
+                callback()
+            }
             return {
                 func: treeToArray,
                 total: 1,
+                isAdmin:false,
                 dialogMap: {
                     update: '编辑出港装载',
                     create: '添加出港装载',
@@ -380,6 +386,10 @@
                 this.loadingQuery.destinationstation = this.$route.params.flightData.destinationstation
                 this.getList()
             }
+            let username = JSON.parse(sessionStorage.getItem('user')).username
+            if(username === 'admin'){
+                this.isAdmin = true
+            }
         },
         computed: {
             carrier: {

@@ -32,7 +32,7 @@
                             <div class="grid-content">
                                 <el-col :span="4">
                                     <div class="grid-content">
-                                        <el-input v-model="listQuery.awba" placeholder="请输入主单号"></el-input>
+                                        <el-input v-model="listQuery.awba" placeholder="请输入主单号" clearable></el-input>
                                     </div>
                                 </el-col>
                                 <div class="grid-content el-btn">
@@ -128,18 +128,16 @@
                     <p></p>
                     <el-button size="mini" type="primary" @click="handleAwbEdit(scope.row)">发修改报</el-button>
 
-                    <el-button size="mini" type="danger" @click="handleAwbDelete(scope.row)">发删除报</el-button>
+                    <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
                     <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
                                :disabled="scope.row.status === '01'">更改状态
                     </el-button>
-
-
                 </template>
             </el-table-column>
         </tree-table>
         <div class="btnFoot">
             <el-row>
-                <el-button type="primary" size="mini"
+                <el-button type="primary" size="mini" v-if="preData.flightno !== undefined || preData.length> 0"
                            @click="handleAddpreInfo">新增预配舱单
                 </el-button>
                 <el-button type="primary" size="mini" @click="handelBackStep"
@@ -162,7 +160,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="7.5" v-if="dialogStatus === 'addAwbh'">
-                        <el-form-item label="分单号">
+                        <el-form-item label="分单号" prop="awbh">
                             <el-input v-model="awbh" clearable/>
                         </el-form-item>
                     </el-col>
@@ -204,18 +202,59 @@
                     </el-col>
                 </el-row>
                 <div class="grid-content content">
-                    货物信息
+                    航程信息
                 </div>
+                <div>
+                    <el-row>
+                        <el-col :span="7.5">
+                            <el-form-item label="承运人" prop="carrier">
+                                <el-input v-model="carrier" disabled clearable/>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="7.5">
+                            <el-form-item label="到达航站" prop="destinationstation">
+                                <el-input v-model="destinationstation" disabled clearable/>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="7.5">
+                            <el-form-item label="承运人1">
+                                <el-input v-model="by1" clearable/>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="7.5">
+                            <el-form-item label="到达航站1">
+                                <el-input v-model="dest1" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="7.5">
+                            <el-form-item label="承运人2">
+                                <el-input v-model="by2" clearable/>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="7.5">
+                            <el-form-item label="到达航站2">
+                                <el-input v-model="dest2" clearable/>
+                            </el-form-item>
+                        </el-col>
 
+                    </el-row>
+                </div>
+                <div class="grid-content content">
+                    货物信息
+                </div>
                 <el-row>
                     <el-col :span="7.5">
-                        <el-form-item label="运单件数" prop="piece">
-                            <el-input v-model.number="preModel.awbinfo.pcs" clearable/>
+                        <el-form-item label="运单件数" prop="awbinfo.pcs">
+                            <el-input v-model="preModel.awbinfo.pcs" clearable/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="7.5">
-                        <el-form-item label="运单重量" prop="weight">
-                            <el-input v-model.number="preModel.awbinfo.weight" clearable/>
+                        <el-form-item label="运单重量" prop="awbinfo.weight">
+                            <el-input v-model="preModel.awbinfo.weight" clearable/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="7.5">
@@ -227,13 +266,13 @@
                 <el-row>
                     <el-col :span="7.5" v-if="dialogStatus !=='addAwbh'">
                         <el-form-item label="预配件数" prop="piece">
-                            <el-input v-model.number="preModel.piece" clearable/>
+                            <el-input v-model="preModel.piece" clearable/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8" v-if="dialogStatus ==='addAwbh'">
                         <el-col :span="13">
                             <el-form-item label="预配件数" prop="piece">
-                                <el-input v-model.number="preModel.piece" clearable/>
+                                <el-input v-model="preModel.piece" clearable/>
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
@@ -242,13 +281,13 @@
                     </el-col>
                     <el-col :span="7.5" v-if="dialogStatus !=='addAwbh'">
                         <el-form-item label="预配重量" prop="weight">
-                            <el-input v-model.number="preModel.weight" clearable/>
+                            <el-input v-model="preModel.weight" clearable/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8" v-if="dialogStatus ==='addAwbh'">
                         <el-col :span="13">
                             <el-form-item label="预配重量" prop="weight">
-                                <el-input v-model.number="preModel.weight" clearable/>
+                                <el-input v-model="preModel.weight" clearable/>
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
@@ -257,10 +296,10 @@
                     </el-col>
 
                     <el-col :span="7.5">
-                        <el-form-item label="预配时间" prop="pretime">
+                        <el-form-item label="预配时间" prop="actime">
                             <el-date-picker value-format="yyyy-MM-dd HH:mm:ss"
                                             v-model="preModel.actime" align="right"
-                                            type="date" placeholder="请选择"/>
+                                            type="datetime" placeholder="请选择"/>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -275,7 +314,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="7.5">
-                        <el-form-item label="海关状态" prop="ex5">
+                        <el-form-item label="海关状态">
                             <el-select v-model="preModel.awbtype" class="filter-item" placeholder="请录入货物类型">
                                 <el-option v-for="item in customTypes" :key="item.value" :label="item.label"
                                            :value="item.value"/>
@@ -331,7 +370,7 @@
                     </el-col>
                     <el-col :span="7.5">
                         <el-form-item label="城市代码">
-                            <el-input v-model="preModel.awbinfo.shpcitycode" clearable/>
+                            <el-input v-model="scityid" maxlength="5" clearable/>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -409,7 +448,7 @@
                     </el-col>
                     <el-col :span="7.5">
                         <el-form-item label="城市代码">
-                            <el-input v-model="preModel.awbinfo.cnscitycode" clearable/>
+                            <el-input v-model="ecityid" clearable maxlength="5"/>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -484,7 +523,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="dialogFormVisible = false">取消</el-button>
-                <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">保存</el-button>
+                <el-button type="primary" @click="dialogStatus !=='create'? createData():updateData()">保存</el-button>
                 <el-button type="success" @click="handleSaveAndSend">保存并发送</el-button>
             </div>
         </el-dialog>
@@ -538,7 +577,13 @@
     import {getMt2201ListForParam, deleteByIsDelete, updateStatus, updateMT2201, addMt2201} from '@/api/exitPre'
     import {Message} from "element-ui";
     import {getResponseForParam} from '@/api/responseDetail'
-    import {validAwb, validAlphabets, validAlphabetsAndNum, validAlphabetsAndSpanceKey} from "@/utils/validate"
+    import {
+        validAwb,
+        validAlphabets,
+        validAlphabetsAndNum,
+        validAlphabetsAndSpanceKey,
+        validatorNum
+    } from "@/utils/validate"
 
     export default {
         name: "ExitPre",
@@ -569,9 +614,16 @@
                 }
                 callback()
             }
+            const validatorNums = (rule, value, callback) => {
+                if (!validatorNum(value)) {
+                    callback("只能输入数字，并且小数位最多两位")
+                }
+                callback()
+            }
             return {
                 func: treeToArray,
                 total: 1,
+                isAdmin:false,
                 listQuery: {
                     pageSize: 1,
                     limitSize: 100,
@@ -607,19 +659,20 @@
                 awbPiece: undefined,
                 awbWeight: undefined,
                 preRoles: {
-                    weight: [{type: 'number', required: true, message: '重量必须为数字', trigger: 'change'}],
-                    piece: [{type: 'number', required: true, message: '件数必须为数字', trigger: 'change'}],
-                    destinationstation: [{required: true, message: '运单目的地必须输入', trigger: 'change'}],
-                    originstation: [{required: true, message: '运单起始站必须数据', trigger: 'change'}],
+                    weight: [{required: true, trigger: 'change', validator: validatorNums}],
+                    piece: [{required: true, trigger: 'change', validator: validatorNums}],
+                    destinationstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
+                    originstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
                     flightdate: [{required: true, message: '航班日期必须输入', trigger: 'change'}],
                     carrier: [{required: true, trigger: 'blur', validator: validatorAwbh}],
                     flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}],
-                    pretime: [{required: true, trigger: 'blur', message: '预配时间不能为空'}],
+                    actime: [{required: true, trigger: 'blur', message: '预配时间不能为空'}],
                     customcode: [{required: true, message: '关区代码必须选择', trigger: 'change'}],
                     awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
+                    awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
                     'awbinfo.collected': [{required: true, message: '付款方式必选', trigger: 'change'}],
                     goodsname: [{required: true, trigger: 'change', validator: validAlphabetsSpanceKey}],
-                    ex5: [{required: true, message: '货物描述不能为空', trigger: 'change'}],
+                    ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}],
                     'awbinfo.sairportid': [{required: true, message: '起始航站不能为空', trigger: 'change'}],
                     'awbinfo.shprname': [{required: true, message: '发货人不能为空', trigger: 'change'}],
                     'awbinfo.shprtel': [{required: true, message: '发货电话不能为空', trigger: 'change'}],
@@ -629,6 +682,8 @@
                     'awbinfo.cnsntel': [{required: true, message: '收货电话不能为空', trigger: 'change'}],
                     'awbinfo.cnsnaddress': [{required: true, message: '收获地址不能为空', trigger: 'change'}],
                     'awbinfo.cnscountyr': [{required: true, message: '国家代码不能为空', trigger: 'change'}],
+                    'awbinfo.weight': [{required: true, trigger: 'change', validator: validatorNums}],
+                    'awbinfo.pcs': [{required: true, trigger: 'change', validator: validatorNums}],
                 },
                 preModel: {
                     awba: undefined,
@@ -651,6 +706,8 @@
                     awbinfo: {
                         pcs: undefined,
                         weight: undefined,
+                        scityid: undefined,
+                        ecityid: undefined,
                         specopeid: undefined,
                         shprname: undefined,
                         shprmobiletype: undefined,
@@ -709,6 +766,10 @@
                 this.getList()
             }
             this.getCountryList()
+            let username = JSON.parse(sessionStorage.getItem('user')).username
+            if(username === 'admin'){
+                this.isAdmin = true
+            }
         },
         computed: {
             awba: {
@@ -768,7 +829,7 @@
                     return this.preModel.goodsname
                 },
                 set: function (val) {
-                    this.preModel.goodsname = val.toUpperCase().trim()
+                    this.preModel.goodsname = val.toUpperCase()
                 }
             },
             specopeid: {
@@ -784,7 +845,7 @@
                     return this.preModel.awbinfo.shprname
                 },
                 set: function (val) {
-                    this.preModel.awbinfo.shprname = val.toUpperCase().trim()
+                    this.preModel.awbinfo.shprname = val.toUpperCase()
                 }
             },
             shpraddress: {
@@ -792,7 +853,7 @@
                     return this.preModel.awbinfo.shpraddress
                 },
                 set: function (val) {
-                    this.preModel.awbinfo.shpraddress = val.toUpperCase().trim()
+                    this.preModel.awbinfo.shpraddress = val.toUpperCase()
                 }
             },
             shprcountyr: {
@@ -808,7 +869,23 @@
                     return this.preModel.awbinfo.shpaeocode
                 },
                 set: function (val) {
-                    this.preModel.awbinfo.shpaeocode = val.toUpperCase().trim()
+                    this.preModel.awbinfo.shpaeocode = val.toUpperCase()
+                }
+            },
+            scityid: {
+                get: function () {
+                    return this.preModel.awbinfo.scityid
+                },
+                set: function (val) {
+                    this.preModel.awbinfo.scityid = val.toUpperCase().trim()
+                }
+            },
+            ecityid: {
+                get: function () {
+                    return this.preModel.awbinfo.ecityid
+                },
+                set: function (val) {
+                    this.preModel.awbinfo.ecityid = val.toUpperCase().trim()
                 }
             },
             cnsnname: {
@@ -816,7 +893,7 @@
                     return this.preModel.awbinfo.cnsnname
                 },
                 set: function (val) {
-                    this.preModel.awbinfo.cnsnname = val.toUpperCase().trim()
+                    this.preModel.awbinfo.cnsnname = val.toUpperCase()
                 }
             },
             cnsnaddress: {
@@ -824,7 +901,7 @@
                     return this.preModel.awbinfo.cnsnaddress
                 },
                 set: function (val) {
-                    this.preModel.awbinfo.cnsnaddress = val.toUpperCase().trim()
+                    this.preModel.awbinfo.cnsnaddress = val.toUpperCase()
                 }
             },
             cnscountyr: {
@@ -832,7 +909,7 @@
                     return this.preModel.awbinfo.cnscountyr
                 },
                 set: function (val) {
-                    this.preModel.awbinfo.cnscountyr = val.toUpperCase().trim()
+                    this.preModel.awbinfo.cnscountyr = val.toUpperCase()
                 }
             },
             cnsrctcname: {
@@ -851,14 +928,6 @@
                     this.preModel.awbinfo.cnsaeocode = val.toUpperCase().trim()
                 }
             },
-            sairportid: {
-                get: function () {
-                    return this.preModel.awbinfo.sairportid
-                },
-                set: function (val) {
-                    this.preModel.awbinfo.sairportid = val.toUpperCase().trim()
-                }
-            },
             by1: {
                 get: function () {
                     return this.preModel.awbinfo.by1
@@ -907,14 +976,6 @@
                     this.preModel.awbinfo.dest3 = val.toUpperCase().trim()
                 }
             },
-            eairportid: {
-                get: function () {
-                    return this.preModel.awbinfo.eairportid
-                },
-                set: function (val) {
-                    this.preModel.awbinfo.eairportid = val.toUpperCase().trim()
-                }
-            }
         },
         methods: {
             // >>>>>>>>>>>>>>>>获取list集合<<<<<<<<<<<<<<<<<<
@@ -970,6 +1031,8 @@
                         pcs: undefined,
                         weight: undefined,
                         specopeid: undefined,
+                        scityid: undefined,
+                        ecityid: undefined,
                         shprname: undefined,
                         shprmobiletype: undefined,
                         shprtel: undefined,
@@ -1024,7 +1087,7 @@
             createData() {
                 this.$refs.preFormData.validate(valid => {
                     if (valid) {
-                        updateMT2201(this.preModel).then(res => {
+                        addMt2201(this.preModel).then(res => {
                             if (res.data.count > 0) {
                                 Message.success("新增成功")
                                 this.dialogFormVisible = false
@@ -1204,8 +1267,8 @@
                             residuePiece += childrenList[i].piece
                             residueWeight += childrenList[i].weight
                         }
-                        this.awbPiece =res.data.dataList[0].piece- residuePiece
-                        this.awbWeight = res.data.dataList[0].weight- residueWeight
+                        this.awbPiece = res.data.dataList[0].piece - residuePiece
+                        this.awbWeight = res.data.dataList[0].weight - residueWeight
                     }
                 })
                 this.dialogStatus = 'addAwbh'

@@ -109,7 +109,7 @@
                     <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)"
                                :disabled="scope.row.status !=='00'">发舱单报
                     </el-button>
-                    <el-button size="mini" type="danger" @click="handleAwbDelete(scope.row)">发删除报</el-button>
+                    <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
 
                     <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"
                                :disabled="scope.row.status ==='00'">更改状态
@@ -193,12 +193,12 @@
                 <el-row>
                     <el-col :span="7.5">
                         <el-form-item label="运单件数" prop="price">
-                            <el-input v-model.number="tidyModel.awbprice"></el-input>
+                            <el-input v-model="tidyModel.awbprice"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="7.5">
                         <el-form-item label="运单重量" prop="weight">
-                            <el-input v-model.number="tidyModel.awbweight"></el-input>
+                            <el-input v-model="tidyModel.awbweight"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="7.5">
@@ -214,12 +214,12 @@
                 <el-row>
                     <el-col :span="7.5">
                         <el-form-item label="装载件数" prop="piece">
-                            <el-input v-model.number="tidyModel.piece"></el-input>
+                            <el-input v-model="tidyModel.piece"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="7.5">
                         <el-form-item label="装载重量" prop="weight">
-                            <el-input v-model.number="tidyModel.weight"></el-input>
+                            <el-input v-model="tidyModel.weight"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="7.5">
@@ -302,7 +302,7 @@
     import {getMt520XListForParam, deleteByIsDelete, updateStatus, updateMt520X, addMt520X} from '@/api/exitTidy'
     import {Message} from "element-ui";
     import {getResponseForParam} from '@/api/responseDetail'
-    import {validAwb, validAlphabets, validAlphabetsAndNum, validAlphabetsAndSpanceKey} from "@/utils/validate"
+    import {validAwb, validAlphabets, validAlphabetsAndNum, validAlphabetsAndSpanceKey,validatorNum} from "@/utils/validate"
 
     export default {
         name: "ExitTidy",
@@ -333,9 +333,16 @@
                 }
                 callback()
             }
+            const validatorNums = (rule, value, callback) => {
+                if (!validatorNum(value)) {
+                    callback("只能输入数字，并且小数位最多两位")
+                }
+                callback()
+            }
             return {
                 func: treeToArray,
                 total: 1,
+                isAdmin:false,
                 dialogMap: {
                     update: '编辑出港理货',
                     create: '添加出港理货',
@@ -361,8 +368,8 @@
                     flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}],
                     originstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
                     destinationstation: [{required: true, trigger: 'blur', validator: validatorAlphabets}],
-                    piece: [{type: 'number', required: true, trigger: 'change', message: '只能输入数字'}],
-                    weight: [{type: 'number', required: true, trigger: 'change', message: '只能输入数字'}],
+                    weight: [{required: true, trigger: 'change', validator: validatorNums}],
+                    piece: [{required: true, trigger: 'change', validator: validatorNums}],
                 },
                 tidyData: [],
                 detailData: [],
@@ -404,6 +411,10 @@
                 }
                 this.getList()
             }
+            let username = JSON.parse(sessionStorage.getItem('user')).username
+            if(username === 'admin'){
+                this.isAdmin = true
+            }
         },
         watch: {
             'tidyModel.endtime': function (newValue, oldValue) {

@@ -648,6 +648,7 @@
                     'awbinfo.cnscountyr': [{required: true, message: '国家代码不能为空', trigger: 'change'}],
                     'awbinfo.cnscomidpre': [{required: true, message: '企业代码类型不能为空', trigger: 'change'}],
                     'awbinfo.cnscomidno': [{required: true, message: '企业代码不能为空', trigger: 'change'}],
+
                 }
             }
         },