Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/outboundManagement/weighingManagementNew.vue

@@ -140,7 +140,7 @@
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                        <ws-input v-if="!carstatus || carjudge" :disabled="tpyeNo == 2" v-model="weighingList.carNo"
+                        <ws-input v-if="!carstatus || carjudge"  v-model="weighingList.carNo"
                           placeholder="请输入车牌号" maxlength="7" size="small" />
                         <el-select v-else filterable clearable v-model="weighingList.carNo" placeholder="请选择车牌号"
                           class="typeselect" @change="carChange">
@@ -153,36 +153,36 @@
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.boxNo" placeholder="请输入箱号"
+                        <ws-input  v-model="weighingList.boxNo" placeholder="请输入箱号"
                           maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.boxNoOther" placeholder="请输入箱号"
+                        <ws-input  v-model="weighingList.boxNoOther" placeholder="请输入箱号"
                           maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.titleNo" placeholder="请输入封号"
+                        <ws-input  v-model="weighingList.titleNo" placeholder="请输入封号"
                           maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.titleNoOther" placeholder="请输入封号"
+                        <ws-input  v-model="weighingList.titleNoOther" placeholder="请输入封号"
                           maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="weighingList.outType == '火运'">
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.wingNumber" placeholder="请输入车厢号"
+                        <ws-input  v-model="weighingList.wingNumber" placeholder="请输入车厢号"
                           maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther" v-if="weighingList.outType == '火运'">
-                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.wingNumberOther" placeholder="请输入车厢号"
+                        <ws-input  v-model="weighingList.wingNumberOther" placeholder="请输入车厢号"
                           maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">