修改箱信息计算 数字输入框 账务管理 报表

src/views/iosBasicData/AirtransportExport/bills/assembly/feecenter.vue

@@ -150,8 +150,8 @@
                     <span>{{ row.isTax ? '是' : '否' }}</span>
                 </template>
                 <template slot="price" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.price" size="small" :min="1" placeholder="请输入"
-                        @blur="priceinputfun($event, row)"></el-input>
+                    <el-input-number v-if="row.edit" v-model="row.price" size="small" :min="1" placeholder="请输入"
+                        @blur="priceinputfun($event, row)" :controls="false" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <!-- <template slot="quantity" slot-scope="{ row }">
@@ -160,8 +160,8 @@
                     <span v-else>{{ row.quantity }}</span>
                 </template> -->
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
-                        :controls="false" :precision="3" placeholder="请输入"  style="width: 100%;"
+                    <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
+                        :precision="3" placeholder="请输入" style="width: 100%;"
                         @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
@@ -229,7 +229,7 @@
                         @click="copyfun('C')">生成应收
                     </el-button>
                     <el-button type="info" plain size="small" :disabled="disabled"
-                    @click="allClick('付费申请', 'C')">付费申请</el-button>
+                        @click="allClick('付费申请', 'C')">付费申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
@@ -301,8 +301,8 @@
                     <span>{{ row.isTax ? '是' : '否' }}</span>
                 </template>
                 <template slot="price" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.price" size="small" :min="1" placeholder="请输入"
-                        @blur="priceinputfun($event, row)"></el-input>
+                    <el-input-number v-if="row.edit" v-model="row.price" size="small" :min="1" placeholder="请输入"
+                        @blur="priceinputfun($event, row)" :controls="false"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <!-- <template slot="quantity" slot-scope="{ row }">
@@ -311,8 +311,8 @@
                     <span v-else>{{ row.quantity }}</span>
                 </template> -->
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
-                        :controls="false" :precision="3" placeholder="请输入"  style="width: 100%;"
+                    <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
+                        :precision="3" placeholder="请输入" style="width: 100%;"
                         @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
@@ -1985,7 +1985,7 @@ export default {
                 for (let item of this.corpCnNameData) {
                     console.log(item)
                     if (item.shortName == value) {
-                      
+
                         this.$set(row, 'shortName', item.shortName)
                         this.$set(row, 'corpCnName', item.cnName)
                         this.$set(row, 'corpEnName', item.enName)

src/views/iosBasicData/AirtransportExport/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -157,9 +157,9 @@
             </el-col>
             <el-col :span="24">
                 <el-form-item label="HLCL免费箱使" prop="corpCnName" label-width="95px">
-                    <el-input type="number" style="width: 50%;" v-model="documentForm.hlclBoxenvoy"
-                              size="small" autocomplete="off" clearable placeholder="HLCL免费箱使" >
-                    </el-input>
+                    <el-input-number style="width: 50%;" v-model="documentForm.hlclBoxenvoy"
+                              size="small" autocomplete="off" clearable placeholder="HLCL免费箱使" :controls="false">
+                    </el-input-number>
                     <span style="margin-left: 10px">天</span>
                 </el-form-item>
             </el-col>

src/views/iosBasicData/AirtransportExport/bills/index.vue

@@ -634,7 +634,7 @@ export default {
                         searchOrder: 6,
                     },
                     {
-                        label: "航次",
+                        label: "航班号",
                         prop: "voyageNo",
                         width: "80",
                         overHidden: true,
@@ -692,11 +692,10 @@ export default {
                         searchOrder: 15,
                     },
                     {
-                        label: "船公司",
+                        label: "航空公司",
                         prop: "carrierCnName",
                         overHidden: true,
                         type: 'select',
-                        dicData: [],
                         filterable: true,
                         remote: true,
                         dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
@@ -940,36 +939,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "V20",
-                        prop: "quantityV20",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
-                        label: "V40",
-                        prop: "quantityV40",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
-                        label: "40HC",
-                        prop: "quantityV40hc",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
-                        label: "V45",
-                        prop: "quantityV45",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
-                        label: "V48",
-                        prop: "quantityV48",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
                         label: "需陆运",
                         prop: "isNeedLand",
                         type: 'select',

src/views/iosBasicData/AirtransportImport/bills/assembly/feecenter.vue

@@ -150,8 +150,8 @@
                     <span>{{ row.isTax ? '是' : '否' }}</span>
                 </template>
                 <template slot="price" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.price" size="small" :min="1" placeholder="请输入"
-                        @blur="priceinputfun($event, row)"></el-input>
+                    <el-input-number v-if="row.edit" v-model="row.price" size="small" :min="1" placeholder="请输入"
+                        @blur="priceinputfun($event, row)" :controls="false"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <!-- <template slot="quantity" slot-scope="{ row }">
@@ -160,7 +160,7 @@
                     <span v-else>{{ row.quantity }}</span>
                 </template> -->
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                    <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1"
                         :controls="false" :precision="3" placeholder="请输入" style="width: 100%;"
                         @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
@@ -301,8 +301,8 @@
                     <span>{{ row.isTax ? '是' : '否' }}</span>
                 </template>
                 <template slot="price" slot-scope="{ row }">
-                    <el-input v-if="row.edit" type="number" v-model="row.price" size="small" :min="1" placeholder="请输入"
-                        @blur="priceinputfun($event, row)"></el-input>
+                    <el-input-number v-if="row.edit" v-model="row.price" size="small" :min="1" placeholder="请输入"
+                        @blur="priceinputfun($event, row)" :controls="false"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <!-- <template slot="quantity" slot-scope="{ row }">
@@ -311,7 +311,7 @@
                     <span v-else>{{ row.quantity }}</span>
                 </template> -->
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                    <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1"
                         :controls="false" :precision="3" placeholder="请输入" style="width: 100%;"
                         @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>

src/views/iosBasicData/AirtransportImport/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -144,9 +144,9 @@
             </el-col>
             <el-col :span="24">
                 <el-form-item label="HLCL免费箱使" prop="corpCnName" label-width="95px">
-                    <el-input type="number" style="width: 50%;" v-model="documentForm.hlclBoxenvoy" size="small"
-                        autocomplete="off" clearable placeholder="HLCL免费箱使">
-                    </el-input>
+                    <el-input-number style="width: 50%;" v-model="documentForm.hlclBoxenvoy" size="small"
+                        autocomplete="off" clearable placeholder="HLCL免费箱使" :controls="false">
+                    </el-input-number>
                     <span style="margin-left: 10px">天</span>
                 </el-form-item>
             </el-col>

src/views/iosBasicData/AirtransportImport/bills/index.vue

@@ -997,36 +997,6 @@ import { getDeptTree } from "@/api/system/dept";
                       overHidden:true,
                   },
                   {
-                      label: "V20",
-                      prop: "quantityV20",
-                      width:"100",
-                      overHidden:true,
-                  },
-                  {
-                      label: "V40",
-                      prop: "quantityV40",
-                      width:"100",
-                      overHidden:true,
-                  },
-                  {
-                      label: "40HC",
-                      prop: "quantityV40hc",
-                      width:"100",
-                      overHidden:true,
-                  },
-                  {
-                      label: "V45",
-                      prop: "quantityV45",
-                      width:"100",
-                      overHidden:true,
-                  },
-                  {
-                      label: "V48",
-                      prop: "quantityV48",
-                      width:"100",
-                      overHidden:true,
-                  },
-                  {
                       label: "需陆运",
                       prop: "isNeedLand",
                       type: 'select',

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -286,7 +286,7 @@
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                    <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1"
                         :controls="false" :precision="3" placeholder="请输入"
                         @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>

src/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -150,9 +150,9 @@
             </el-col>
             <el-col :span="24">
                 <el-form-item label="HLCL免费箱使" prop="corpCnName" label-width="95px">
-                    <el-input type="number" style="width: 50%;" v-model="documentForm.hlclBoxenvoy" size="small"
-                        autocomplete="off" clearable placeholder="HLCL免费箱使">
-                    </el-input>
+                    <el-input-number style="width: 50%;" v-model="documentForm.hlclBoxenvoy" size="small"
+                        autocomplete="off" clearable placeholder="HLCL免费箱使" :controls="false">
+                    </el-input-number>
                     <span style="margin-left: 10px">天</span>
                 </el-form-item>
             </el-col>

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -14,10 +14,16 @@
             <el-table-column prop="lineNo" label="行号" width="50px">
                 <template slot-scope="scope">{{ Number(scope.$index) + 1 }}</template>
             </el-table-column>
-            <el-table-column prop="isCleared" label="核销" width="50px">
+            <el-table-column prop="isCleared" label="核销" width="70px">
                 <template slot-scope="{ row }">
-                    <span v-if="row.isCleared == item.dictKey" v-for="item in ifInvoiceData" :key="item.dictKey">
-                        {{ item.dictValue }}
+                    <span v-if="row.isCleared==0 ">
+                        未销账
+                    </span>
+                    <span v-if="row.isCleared==3 ">
+                        部分销账
+                    </span>
+                    <span v-if="row.isCleared==9 ">
+                        销账
                     </span>
                 </template>
             </el-table-column>

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -457,7 +457,7 @@
                                 <span style="color: #1e9fff">ETA</span>
                             </span>
                             <el-date-picker style="width: 100%;" v-model="assemblyForm.eta" clearable type="date"
-                                size="small" :disabled="detailData.seeDisabled" value-format="yyyy-MM-dd HH:mm:ss"
+                                size="small" :disabled="detailData.seeDisabled" value-format="yyyy-MM-dd"
                                 placeholder="选择日期">
                             </el-date-picker>
                         </el-form-item>

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -1,17 +1,22 @@
 <template>
     <basic-container>
-        <avue-crud  style="height: 200px;" :option="option" :table-loading="loading" :data="assemblyForm.preContainersList" :page.sync="page"
-            :permission="permissionList" :before-open="beforeOpen" v-model="form"
-            :cell-style="{ padding: '0px', textAlign: 'center' }" ref="crud" @row-update="rowUpdate" @row-save="rowSave"
-            @row-del="rowDel" @selection-change="selectionChange" @refresh-change="refreshChange"
-            @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 309.1)"
+        <avue-crud style="height: 200px;" :option="option" :table-loading="loading"
+            :data="assemblyForm.preContainersList" :page.sync="page" :permission="permissionList"
+            :before-open="beforeOpen" v-model="form" :cell-style="{ padding: '0px', textAlign: 'center' }" ref="crud"
+            @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @selection-change="selectionChange"
+            @refresh-change="refreshChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 309.1)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 309.1)">
             <template slot="menuLeft">
                 <el-button type="primary" size="small" :disabled="seeDisabled" @click.stop="addfun">新 增</el-button>
-                <el-button type="danger" size="small" plain :disabled="seeDisabled||assemblyForm.preContainersList.length==0" @click.stop="handleDelete">一键删除
+                <el-button type="danger" size="small" plain
+                    :disabled="seeDisabled || assemblyForm.preContainersList.length == 0"
+                    @click.stop="handleDelete">一键删除
                 </el-button>
-                <el-button type="primary" size="small" :disabled="seeDisabled||assemblyForm.preContainersList.length==0" @click="batchSavefun">一键保存</el-button>
-                <el-button type="info" plain size="small" :disabled="seeDisabled||assemblyForm.preContainersList.length==0" @click="onclickEdit">一键编辑
+                <el-button type="primary" size="small"
+                    :disabled="seeDisabled || assemblyForm.preContainersList.length == 0"
+                    @click="batchSavefun">一键保存</el-button>
+                <el-button type="info" plain size="small"
+                    :disabled="seeDisabled || assemblyForm.preContainersList.length == 0" @click="onclickEdit">一键编辑
                 </el-button>
             </template>
             <template slot-scope="scope" slot="menu">
@@ -404,7 +409,13 @@ export default {
                 });
                 return
             }
+            let numberSum = 0
+            let grossWeightSum = 0
+            let measurementSum = 0
             for (let item of this.assemblyForm.preContainersList) {
+                numberSum += Number(item.number)
+                grossWeightSum += Number(item.grossWeight)
+                measurementSum += Number(item.measurement)
                 if (!item.cntrTypeCode) {
                     this.$message.warning('请选择尺码箱型')
                     return;
@@ -415,6 +426,7 @@ export default {
                 }
                 item.pid = this.assemblyForm.id
             }
+            if (numberSum != this.assemblyForm.quantity) return this.$message.error('箱型所有的件数不等于总件数')
             this.$confirm("批量保存后，需要重新配箱，确认继续?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -464,7 +476,7 @@ export default {
         containersEqualDistributionfun(type) {
             containersEqualDistribution({
                 pid: this.assemblyForm.id,
-                type:type,
+                type: type,
                 waitingBox: this.assemblyForm.waitingBoxList[0]
             }).then(res => {
                 if (res.data.data instanceof Array) {
@@ -478,8 +490,8 @@ export default {
                     this.$message({
                         type: 'warning',
                         dangerouslyUseHTMLString: true,
-                        message: '<span style="color:red">注意!!!件数不能平均分 ,请手工配箱,或者修改件数.</span>\n'+
-                        '<table border="1">\n' +
+                        message: '<span style="color:red">注意!!!件数不能平均分 ,请手工配箱,或者修改件数.</span>\n' +
+                            '<table border="1">\n' +
                             '  <thead>\n' +
                             '    <tr>\n' +
                             '      <th></th>\n' +

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -156,9 +156,9 @@
             </el-col>
             <el-col :span="24">
                 <el-form-item label="HLCL免费箱使" prop="corpCnName" label-width="95px">
-                    <el-input type="number" style="width: 50%;" v-model="documentForm.hlclBoxenvoy" size="small"
-                        autocomplete="off" clearable placeholder="HLCL免费箱使">
-                    </el-input>
+                    <el-input-number  style="width: 50%;" v-model="documentForm.hlclBoxenvoy" size="small"
+                        autocomplete="off" clearable placeholder="HLCL免费箱使" :controls="false">
+                    </el-input-number>
                     <span style="margin-left: 10px">天</span>
                 </el-form-item>
             </el-col>

src/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue

@@ -687,6 +687,7 @@ export default {
 
           data.pageOne = 'Page : 1 of 1'
           // 处理超长数据
+          console.log(data.commodityDescr)
           if (data.hshipperDetails) {
             let arrDeteil = []
             arrDeteil = data.hshipperDetails.split('\n')
@@ -719,7 +720,7 @@ export default {
               data.hnotifyDetails = data.hnotifyDetails
             }
           }
-
+          console.log(data.commodityDescr)
           // 处理箱号
           if (this.isPrintTheBoxNumber) {
             data.commodityDescr += '\n.\n.\n'
@@ -764,20 +765,24 @@ export default {
           // }
 
           if (data.commodityDescr) {
-            var descriptionIndex2 = data.commodityDescr.indexOf('\n')
-            for (let i = 0; i < 19; i++) {
-              descriptionIndex2 = data.commodityDescr.indexOf('\n', descriptionIndex2 + 1);
-            }
-            if (descriptionIndex2 != -1) {
-              data.pageOne = 'Page : 1 of 2'
-              data.pageTwo = 'Page : 2 of 2'
-              var extraLongText = data.commodityDescr.substring(descriptionIndex2 + 2, data.commodityDescr.length)
-              data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2)
-              data.extraLongTips = '** TO BE CONTINUED ON ATTACHED LIST **'
-              data.extraLongText = extraLongText
+            //   var descriptionIndex2 = data.commodityDescr.indexOf('\n')
+            //   for (let i = 0; i < 19; i++) {
+            //     descriptionIndex2 = data.commodityDescr.indexOf('\n', descriptionIndex2 + 1);
+            //   }
+            //   if (descriptionIndex2 != -1) {
+            //     data.pageOne = 'Page : 1 of 2'
+            //     data.pageTwo = 'Page : 2 of 2'
+            //     var extraLongText = data.commodityDescr.substring(descriptionIndex2 + 2, data.commodityDescr.length)
+            //     data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2)
+            //     data.extraLongTips = '** TO BE CONTINUED ON ATTACHED LIST **'
+            //     data.extraLongText = extraLongText
+            //   }
+            let arrDeteil = []
+            arrDeteil = data.commodityDescr.split('\n')
+            if (arrDeteil.length > 19) {
+              data.commodityDescr = arrDeteil.slice(0, 19).join('\n')
             }
           }
-
           // console.log(data.hshipperDetails, 'hshipperDetails2')
 
 

src/views/iosBasicData/accounts/index.vue

@@ -60,11 +60,11 @@
                   <span v-else >否</span>
               </template>
               <template slot="quantityOpenDr" slot-scope="{ row }">
-                  <el-input style="width: 100%;" v-model="row.quantityOpenDr"
-                            v-if="row.edit" type="number" min="0"
+                  <el-input-number style="width: 100%;" v-model="row.quantityOpenDr"
+                            v-if="row.edit" min="0" :controls="false"
                             size="mini" autocomplete="off" clearable
                             placeholder="请输入期初借方数量" >
-                  </el-input>
+                  </el-input-number>
                   <span v-else >{{row.quantityOpenDr}}</span>
               </template>
 

src/views/iosBasicData/aeamends/assembly/amendsCostdetails.vue

@@ -146,13 +146,13 @@
                 <span>{{row.isTax?'是':'否'}}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
-                <el-input v-if="row.editType" type="number" v-model="row.price" size="small" :min="1"
-                          placeholder="请输入单价" @blur="priceinputfun($event,row)"></el-input>
+                <el-input-number v-if="row.editType" :controls="false" v-model="row.price" size="small" :min="1"
+                          placeholder="请输入单价" @blur="priceinputfun($event,row)"></el-input-number>
                 <span v-else>{{row.price}}</span>
             </template>
             <template slot="quantity" slot-scope="{ row }">
-                <el-input v-if="row.editType" type="number" v-model="row.quantity" size="small" :min="1"
-                          placeholder="请输入数量" @blur="quantityinputfun(row)"></el-input>
+                <el-input-number v-if="row.editType" :controls="false" v-model="row.quantity" size="small" :min="1"
+                          placeholder="请输入数量" @blur="quantityinputfun(row)"></el-input-number>
                 <span v-else>{{row.quantity}}</span>
             </template>
             <template slot="remarks" slot-scope="{ row }">

src/views/iosBasicData/aiamends/assembly/amendsCostdetails.vue

@@ -146,13 +146,13 @@
                 <span>{{row.isTax?'是':'否'}}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
-                <el-input v-if="row.editType" type="number" v-model="row.price" size="small" :min="1"
-                          placeholder="请输入单价" @blur="priceinputfun($event,row)"></el-input>
+                <el-input-number v-if="row.editType" :controls="false" v-model="row.price" size="small" :min="1"
+                          placeholder="请输入单价" @blur="priceinputfun($event,row)"></el-input-number>
                 <span v-else>{{row.price}}</span>
             </template>
             <template slot="quantity" slot-scope="{ row }">
-                <el-input v-if="row.editType" type="number" v-model="row.quantity" size="small" :min="1"
-                          placeholder="请输入数量" @blur="quantityinputfun(row)"></el-input>
+                <el-input-number v-if="row.editType" :controls="false" v-model="row.quantity" size="small" :min="1"
+                          placeholder="请输入数量" @blur="quantityinputfun(row)"></el-input-number>
                 <span v-else>{{row.quantity}}</span>
             </template>
             <template slot="remarks" slot-scope="{ row }">

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -36,11 +36,11 @@
             <!--</el-table-column>-->
             <el-table-column prop="currentAmountCNY" label="本次CNY" width="120px">
                 <template slot-scope="scope">
-                    <el-input style="width: 100%;" v-model="scope.row.currentAmountCNY" v-if="!editSave" type="number"
-                        min="0" size="mini" autocomplete="off"
-                        :disabled="scope.row.curCode != 'CNY' || settlementdistar || !(form.status == '0' || form.status == '4')"
+                    <el-input-number style="width: 100%;" v-model="scope.row.currentAmountCNY" v-if="!editSave" min="0"
+                        size="mini" autocomplete="off" :controls="false"
+                        :disabled="scope.row.curCode != 'CNY' || settlementdistar || !(form.status == '0' || form.status == '4'|| form.status == null)"
                         clearable placeholder="请输入本次发票金额" @change="armbChange(scope.row)">
-                    </el-input>
+                    </el-input-number>
                     <span v-else>{{ scope.row.currentAmountCNY }}</span>
                 </template>
             </el-table-column>

src/views/iosBasicData/finvouchers/assembly/fromtableDetails.vue

@@ -65,20 +65,20 @@
                     prop="amountDr"
                     label="借方" width="120px" >
                     <template slot-scope="{ row }">
-                        <el-input style="width: 100%;" type="number" v-model="row.amountDr"
+                        <el-input-number style="width: 100%;" v-model="row.amountDr"
                                   size="small" autocomplete="off" :disabled="!row.accountId||disabled"
-                                   placeholder="请输入借方" @blur="amountBlur(row,'D')" >
-                        </el-input>
+                                   placeholder="请输入借方" @blur="amountBlur(row,'D')" :controls="false">
+                        </el-input-number>
                     </template>
                 </el-table-column>
                 <el-table-column
                     prop="amountCr"
                     label="货方" width="120px" >
                     <template slot-scope="{ row }">
-                        <el-input style="width: 100%;" type="number" v-model="row.amountCr"
+                        <el-input-number style="width: 100%;" v-model="row.amountCr"
                                   size="small" autocomplete="off" :disabled="!row.accountId||disabled"
-                                   placeholder="请输入货方" @blur="amountBlur(row,'C')" >
-                        </el-input>
+                                   placeholder="请输入货方" @blur="amountBlur(row,'C')" :controls="false">
+                        </el-input-number>
                     </template>
                 </el-table-column>
             </el-table-column>
@@ -91,11 +91,11 @@
                     prop="exrate"
                     label="汇率" width="100px">
                     <template slot-scope="{ row }">
-                        <el-input v-if="row.curCode == 'USD'" style="width: 100%;" type="number"
+                        <el-input-number v-if="row.curCode == 'USD'" style="width: 100%;"
                                   v-model="row.exrate"
                                   size="small" autocomplete="off"
                                   clearable placeholder="请输入借方" @blur="amountBlur(row,'exrate')" :disabled="disabled">
-                        </el-input>
+                        </el-input-number>
                         <span v-else >{{row.exrate}}</span>
                     </template>
                 </el-table-column>
@@ -103,20 +103,20 @@
                     prop="amountDrUsd"
                     label="借方" width="120px">
                     <template slot-scope="{ row }">
-                        <el-input style="width: 100%;" type="number" v-model="row.amountDrUsd"
+                        <el-input-number style="width: 100%;" v-model="row.amountDrUsd"
                                   size="small" autocomplete="off" :disabled="row.curCode == 'CNY' || !row.accountId||disabled"
-                                  clearable placeholder="请输入借方" @blur="amountUSDBlur(row,'Dusd')" >
-                        </el-input>
+                                  clearable placeholder="请输入借方" @blur="amountUSDBlur(row,'Dusd')" :controls="false">
+                        </el-input-number>
                     </template>
                 </el-table-column>
                 <el-table-column
                     prop="amountCrUsd"
                     label="货方" width="120px">
                     <template slot-scope="{ row }">
-                        <el-input style="width: 100%;" type="number" v-model="row.amountCrUsd"
+                        <el-input-number style="width: 100%;" v-model="row.amountCrUsd"
                                   size="small" autocomplete="off" :disabled="row.curCode == 'CNY' || !row.accountId||disabled"
-                                  clearable placeholder="请输入货方" @blur="amountUSDBlur(row,'Cusd')" >
-                        </el-input>
+                                  clearable placeholder="请输入货方" @blur="amountUSDBlur(row,'Cusd')" :controls="false">
+                        </el-input-number>
                     </template>
                 </el-table-column>
             </el-table-column>

src/views/iosBasicData/seamends/assembly/amendsCostdetails.vue

@@ -146,13 +146,13 @@
                 <span>{{row.isTax?'是':'否'}}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
-                <el-input v-if="row.editType" type="number" v-model="row.price" size="small" :min="1"
-                          placeholder="请输入单价" @blur="priceinputfun($event,row)"></el-input>
+                <el-input-number v-if="row.editType" v-model="row.price" size="small" :min="1"
+                          placeholder="请输入单价" @blur="priceinputfun($event,row)" :controls="false"></el-input-number>
                 <span v-else>{{row.price}}</span>
             </template>
             <template slot="quantity" slot-scope="{ row }">
-                <el-input v-if="row.editType" type="number" v-model="row.quantity" size="small" :min="1"
-                          placeholder="请输入数量" @blur="quantityinputfun(row)"></el-input>
+                <el-input-number v-if="row.editType" v-model="row.quantity" size="small" :min="1"
+                          placeholder="请输入数量" @blur="quantityinputfun(row)" :controls="false"></el-input-number>
                 <span v-else>{{row.quantity}}</span>
             </template>
             <template slot="remarks" slot-scope="{ row }">

src/views/iosBasicData/siamends/assembly/amendsCostdetails.vue

@@ -146,13 +146,13 @@
                 <span>{{row.isTax?'是':'否'}}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
-                <el-input v-if="row.editType" type="number" v-model="row.price" size="small" :min="1"
-                          placeholder="请输入单价" @blur="priceinputfun($event,row)"></el-input>
+                <el-input-number v-if="row.editType" v-model="row.price" size="small" :min="1"
+                          placeholder="请输入单价" @blur="priceinputfun($event,row)" :controls="false"></el-input-number>
                 <span v-else>{{row.price}}</span>
             </template>
             <template slot="quantity" slot-scope="{ row }">
-                <el-input v-if="row.editType" type="number" v-model="row.quantity" size="small" :min="1"
-                          placeholder="请输入数量" @blur="quantityinputfun(row)"></el-input>
+                <el-input-number v-if="row.editType" v-model="row.quantity" size="small" :min="1"
+                          placeholder="请输入数量" @blur="quantityinputfun(row)" :controls="false"></el-input-number>
                 <span v-else>{{row.quantity}}</span>
             </template>
             <template slot="remarks" slot-scope="{ row }">

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -264,13 +264,13 @@
                     </tempalte>
                     <tempalte slot="number" slot-scope="{ row }">
                         <el-input-number v-if="row.$cellEdit && !row.srcId" v-model="row.number" :controls="false"
-                            placeholder="请输入 件数" size="small" style="width: 100%;"
-                            @change="amountChange(row)"></el-input-number>
+                            placeholder="请输入 件数" size="small" style="width: 100%;"></el-input-number>
                         <span v-else>{{ row.number }}</span>
                     </tempalte>
                     <tempalte slot="netWeight" slot-scope="{ row }">
                         <el-input-number v-if="row.$cellEdit && !row.srcId" v-model="row.netWeight" :controls="false"
-                            placeholder="请输入 净重" size="small" style="width: 100%;"></el-input-number>
+                            placeholder="请输入 净重" size="small" style="width: 100%;"
+                            @change="amountChange(row)"></el-input-number>
                         <span v-else>{{ row.netWeight }}</span>
                     </tempalte>
                     <tempalte slot="grossWeight" slot-scope="{ row }">
@@ -399,12 +399,12 @@
                             {{ row.confirmDispatchVehicles == 1 ? '撤销确认' : '入库确认' }}
                         </el-button>
                         <el-button size="small" type="text"
-                            :disabled="editDisabled || row.surplusQuantity == 0 || row.$cellEdit||row.confirmDispatchVehicles != 1"
+                            :disabled="editDisabled || row.surplusQuantity == 0 || row.$cellEdit || row.confirmDispatchVehicles != 1"
                             @click="rowCell('生成出库', row, index)">
                             出 库
                         </el-button>
                         <el-button size="small" type="text"
-                            :disabled="editDisabled || row.surplusQuantity == 0 || row.$cellEdit||row.confirmDispatchVehicles != 1"
+                            :disabled="editDisabled || row.surplusQuantity == 0 || row.$cellEdit || row.confirmDispatchVehicles != 1"
                             @click="rowCell('撤销出库', row, index)">
                             撤销出库
                         </el-button>
@@ -1897,8 +1897,13 @@ export default {
             });
         },
         amountChange(row) {
-            if (!row.number) row.number = 1
-            row.price = _.round(_.divide(row.amount, row.number ? row.number : 1), 2)
+            // if (!row.netWeight) row.netWeight = 1
+            if (row.netWeight > 0) {
+                row.price = _.round(_.divide(row.amount, row.netWeight ? row.netWeight : 1), 2)
+            }
+            if (!row.netWeight) {
+                row.price = 0
+            }
         },
         boxClosed() {
             this.boxForm = {