货代bug 2024-1-19

src/util/regularJudgment.js

@@ -0,0 +1,18 @@
+/**
+ * 只能输入正浮点数正则判断
+ */
+export function regularFloating(value) {
+  return value.replace(/[^\d.]/g,'')
+}
+/**
+ * 只能输入整数正则判断
+ */
+export function regularInteger(value) {
+  return value.replace(/^0+(\d)|[^\d]+/g,'')
+}
+/**
+ * 只能输入正负都可以浮点数正则判断
+ */
+export function regularBurdenfloating(value) {
+  return value.replace(/[^-?\d.]/g,'')
+}

src/views/billM/billingCenter/index.vue

@@ -62,6 +62,7 @@
   import {getList, getDetail, add, update, remove} from "@/api/iosBasicData/finaccbills";
   import {mapGetters} from "vuex";
   import {BcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
+  import {getWorkDicts} from "@/api/system/dictbiz";
 
   export default {
     data() {
@@ -172,13 +173,11 @@
               label: "业务类型",
               prop: "businessType",
               type: 'select',
-              dicData:[{
-                label:'海运出口',
-                value:'SE'
-              },{
-                label:'海运进口',
-                value:'SI'
-              }],
+              dicData:[],
+              props: {
+                  label: "dictValue",
+                  value: "dictKey"
+              },
               overHidden:true,
               rules: [{
                 required: true,
@@ -676,8 +675,16 @@
     async created() {
       this.option = await this.getColumnData(this.getColumnName(313), this.optionBack);
       this.getBcorpslistByTypefun()
+        this.getWorkDictsfun()
     },
     methods: {
+        // 获取字典数据
+        getWorkDictsfun() {
+            // 获取业务类型
+            getWorkDicts('business_type_los').then(res=>{
+                this.findObject(this.option.column, "businessType").dicData = res.data.data
+            })
+        },
       getBcorpslistByTypefun(){
           getBcorpslistByType(1,10).then(res=>{
               this.findObject(this.option.column, "corpCnName").dicData = res.data.data.records

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

@@ -1270,19 +1270,16 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 if (this.form.cargoType = 'dry') {
                     // 普货
                     this.form.billNoFormat = 'KYCK-PH'
-                    this.form.businessTypeCode = 'KYCK-PH'
                 }else if (this.form.cargoType = 'danger'){
                     // 危险品
                     this.form.billNoFormat = 'KYCK-WXP'
-                    this.form.businessTypeCode = 'KYCK-WXP'
                 }else if (this.form.cargoType = 'reefer') {
                     // 冻柜
                     this.form.billNoFormat = 'KYCK-DG'
-                    this.form.businessTypeCode = 'KYCK-DG'
                 }else {
                     this.form.billNoFormat = 'KYCK'
-                    this.form.businessTypeCode = 'KYCK'
                 }
+                this.form.businessTypeCode = 'KYCK'
                 // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
                 this.searchSplit()
                 // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩

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

@@ -395,11 +395,11 @@
                         <div>
                             <el-col :span="12">
                                 <el-form-item label="件数" prop="quantity" label-width="80px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">件数</span>
                                 </span>
-                                    <el-input ref="quantityRef" type="number" style="width: 100%;" v-model="assemblyForm.quantity"
+                                    <el-input ref="quantityRef" style="width: 100%;" v-model="assemblyForm.quantity"
                                               size="small" autocomplete="off" min="1"
                                               :disabled="detailData.seeDisabled" @input="quantityInput"
                                               @focus="quantityFocus"
@@ -408,7 +408,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="包装" prop="packingUnit" label-width="50px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">包装</span>
                                 </span>
@@ -431,27 +431,27 @@
                         <div>
                             <el-col :span="12">
                                 <el-form-item label="毛重(KGS)" prop="grossWeight" label-width="80px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">毛重(KGS)</span>
                                 </span>
-                                    <el-input type="number" step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
-                                              size="small" autocomplete="off"
+                                    <el-input-number step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
+                                              size="small" autocomplete="off" :controls="false"
                                               :disabled="detailData.seeDisabled"
-                                              clearable placeholder="请选择毛重" ></el-input>
+                                              clearable placeholder="请选择毛重" ></el-input-number>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="尺码(CBM)" prop="measurement" label-width="90px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">尺码(CBM)</span>
                                 </span>
-                                    <el-input type="number" step="0.01" style="width: 106%;"
+                                    <el-input-number step="0.01" style="width: 106%;"
                                               v-model="assemblyForm.measurement"
-                                              size="small" autocomplete="off"
+                                              size="small" autocomplete="off" :controls="false"
                                               :disabled="detailData.seeDisabled"
-                                              clearable placeholder="请选择尺码/体积" ></el-input>
+                                              clearable placeholder="请选择尺码/体积" ></el-input-number>
                                 </el-form-item>
                             </el-col>
                         </div>
@@ -661,7 +661,6 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
-
                 </el-form>
             </div>
             <span slot="footer" class="dialog-footer">

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

@@ -18,14 +18,12 @@
       <template slot="menuLeft">
           <el-button
               type="primary"
-              icon="el-icon-plus"
               size="small"
               :disabled="seeDisabled"
               @click.stop="addfun"
           >新 增</el-button>
         <el-button type="danger"
                    size="small"
-                   icon="el-icon-delete"
                    plain
                    :disabled="seeDisabled"
                    @click.stop="handleDelete">一键删除
@@ -145,6 +143,8 @@ import {number} from "echarts";
               type:"number",
               width:'120',
               cell:true,
+              controls:false,
+              precision:0,
               rules: [{
                 required: true,
                 message: " ",
@@ -157,6 +157,7 @@ import {number} from "echarts";
               width:'120',
               type:"number",
               cell:true,
+                controls:false,
               rules: [{
                   required: true,
                   message: " ",
@@ -169,6 +170,7 @@ import {number} from "echarts";
               width:'120',
               type:"number",
               cell:true,
+                controls:false,
             },
             {
               label: "体积(CBM)",
@@ -176,6 +178,7 @@ import {number} from "echarts";
               width:'120',
               type:"number",
               cell:true,
+                controls:false,
               rules: [{
                  required: true,
                  message: " ",
@@ -186,6 +189,7 @@ import {number} from "echarts";
               label: "温度",
               prop: "temperature",
               cell:true,
+                controls:false,
               type:"number",
               width: "120"
             },
@@ -206,6 +210,7 @@ import {number} from "echarts";
               label: "通风度",
               prop: "ventilation",
               cell:true,
+                controls:false,
               type:"number",
               width: "120"
             },
@@ -213,6 +218,7 @@ import {number} from "echarts";
               label: "湿度",
               prop: "humidity",
               cell:true,
+                controls:false,
               type:"number",
               width: "120"
             },

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

@@ -189,13 +189,15 @@
                     <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"
+                                     :controls="false" :precision="2"
+                                     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.edit" type="number" v-model="row.quantity" size="small" :min="1"
-                              placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
+                    <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1"
+                              :controls="false" :precision="0"
+                                     placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{row.quantity}}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -204,8 +206,8 @@
                     <span v-else>{{row.remarks}}</span>
                 </template>
                 <template slot-scope="scope" slot="menu">
-                    <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'D')">保存</el-button>
-                    <el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="editDfun(scope.row,scope.index)">编辑</el-button>
+                    <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'D')">保存</el-button>-->
+                    <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="editDfun(scope.row,scope.index)">编辑</el-button>-->
                     <el-button type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="deletefun(scope.row,scope.index,'D')">删除</el-button>
                 </template>
             </avue-crud>
@@ -360,13 +362,15 @@
                     <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"
+                              :controls="false" :precision="2"
+                              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.edit" type="number" v-model="row.quantity" size="small" :min="1"
-                              placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
+                    <el-input-number v-if="row.edit" type="number" v-model="row.quantity" size="small" :min="1"
+                                     :controls="false" :precision="0"
+                              placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{row.quantity}}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -375,8 +379,8 @@
                     <span v-else>{{row.remarks}}</span>
                 </template>
                 <template slot-scope="scope" slot="menu">
-                    <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'C')">保存</el-button>
-                    <el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="editCfun(scope.row,scope.index)">编辑</el-button>
+                    <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'C')">保存</el-button>-->
+                    <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="editCfun(scope.row,scope.index)">编辑</el-button>-->
                     <el-button type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="deletefun(scope.row,scope.index,'C')">删除</el-button>
                 </template>
             </avue-crud>

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -1217,19 +1217,16 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 if (this.form.cargoType = 'dry') {
                     // 普货
                     this.form.billNoFormat = 'HYJK-PH'
-                    this.form.businessTypeCode = 'HYJK-PH'
                 }else if (this.form.cargoType = 'danger'){
                     // 危险品
                     this.form.billNoFormat = 'HYJK-WXP'
-                    this.form.businessTypeCode = 'HYJK-WXP'
                 }else if (this.form.cargoType = 'reefer') {
                     // 冻柜
                     this.form.billNoFormat = 'HYJK-DG'
-                    this.form.businessTypeCode = 'HYJK-DG'
                 }else {
                     this.form.billNoFormat = 'HYJK'
-                    this.form.businessTypeCode = 'HYJK'
                 }
+                this.form.businessTypeCode = 'HYJK'
                 // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
                 this.searchSplit()
                 // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩

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

@@ -319,36 +319,31 @@
               </template>
 
               <template slot="menuLeft">
-                  <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新建业务
+                  <el-button type="primary" size="small" @click="addbtnfun()">新建业务
                   </el-button>
                   <el-button type="primary"
                              size="small"
-                             icon="el-icon-delete"
                              plain @click="CopyDocumentsfun">复制单据
                   </el-button>
                   <el-button type="success"
                              size="small"
-                             icon="el-icon-plus"
                              plain
                              @click="increaseMawb">分单->主单
                   </el-button>
                   <el-button type="warning"
                              size="small"
-                             icon="el-icon-delete"
                              plain
                              v-if="query.billStatus == 0"
                              @click="Disembarkingfun">退 舱
                   </el-button>
                   <el-button type="primary"
                              size="small"
-                             icon="el-icon-delete"
                              plain
                              v-if="query.billStatus == 1"
                              @click="revokeWithdrawalfun" >撤销退舱
                   </el-button>
                   <el-button type="danger"
                              size="small"
-                             icon="el-icon-delete"
                              plain
                              v-if="query.billStatus != 3"
                              @click="handleDelete">删 除

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

@@ -490,11 +490,11 @@
                         <div>
                             <el-col :span="12">
                                 <el-form-item label="件数" prop="quantity" label-width="80px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">件数</span>
                                 </span>
-                                    <el-input ref="quantityRef" type="number" style="width: 100%;" v-model="assemblyForm.quantity"
+                                    <el-input ref="quantityRef" style="width: 100%;" v-model="assemblyForm.quantity"
                                               size="small" autocomplete="off" min="1"
                                               :disabled="detailData.seeDisabled" @input="quantityInput"
                                               @focus="quantityFocus"
@@ -503,7 +503,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="包装" prop="packingUnit" label-width="50px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]"  >
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]"  >
                                 <span slot="label">
                                     <span style="color: #1e9fff">包装</span>
                                 </span>
@@ -526,26 +526,26 @@
                         <div>
                             <el-col :span="12">
                                 <el-form-item label="毛重(KGS)" prop="grossWeight" label-width="80px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">毛重(KGS)</span>
                                 </span>
-                                    <el-input type="number" step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
+                                    <el-input step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
                                               size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled"
+                                              :disabled="detailData.seeDisabled" @input="floatingInput($event,'grossWeight')"
                                               clearable placeholder="请选择毛重" ></el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="尺码(CBM)" prop="measurement" label-width="90px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">尺码(CBM)</span>
                                 </span>
-                                    <el-input type="number" step="0.01" style="width: 106%;"
+                                    <el-input step="0.01" style="width: 106%;"
                                               v-model="assemblyForm.measurement"
                                               size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled"
+                                              :disabled="detailData.seeDisabled" @input="floatingInput($event,'measurement')"
                                               clearable placeholder="请选择尺码/体积" ></el-input>
                                 </el-form-item>
                             </el-col>
@@ -858,6 +858,7 @@ import {textareaWrap} from "@/util/messageReminder";
 import emailhash from '@/views/iosBasicData/SeafreightExportF/bills/assembly/Jsonfile/emailhash.json'
 import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 import {NdayDate} from "@/util/date";
+import {regularFloating, regularInteger} from "@/util/regularJudgment";
 
     export default {
         props:{
@@ -984,7 +985,11 @@ import {NdayDate} from "@/util/date";
             },
             // 件数监听
             quantityInput(value){
-                this.$set(this.assemblyForm,'quantity',value.replace(/^0+(\d)|[^\d]+/g,''))
+                this.$set(this.assemblyForm,'quantity',regularInteger(value))
+            },
+            // 正浮点数正则监听
+            floatingInput(value,name){
+                this.$set(this.assemblyForm,name,regularFloating(value))
             },
             // 详情接口
             billsDetailfun(){

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

@@ -18,14 +18,12 @@
       <template slot="menuLeft">
           <el-button
               type="primary"
-              icon="el-icon-plus"
               size="small"
               :disabled="seeDisabled"
               @click.stop="addfun"
           >新 增</el-button>
         <el-button type="danger"
                    size="small"
-                   icon="el-icon-delete"
                    plain
                    :disabled="seeDisabled"
                    @click.stop="handleDelete">一键删除
@@ -145,6 +143,8 @@ import {number} from "echarts";
               type:"number",
               width:'120',
               cell:true,
+              controls:false,
+              precision:0,
               rules: [{
                 required: true,
                 message: " ",
@@ -157,6 +157,7 @@ import {number} from "echarts";
               width:'120',
               type:"number",
               cell:true,
+              controls:false,
               rules: [{
                   required: true,
                   message: " ",
@@ -169,6 +170,7 @@ import {number} from "echarts";
               width:'120',
               type:"number",
               cell:true,
+              controls:false,
             },
             {
               label: "体积(CBM)",
@@ -176,6 +178,7 @@ import {number} from "echarts";
               width:'120',
               type:"number",
               cell:true,
+              controls:false,
               rules: [{
                  required: true,
                  message: " ",
@@ -186,6 +189,7 @@ import {number} from "echarts";
               label: "温度",
               prop: "temperature",
               cell:true,
+              controls:false,
               type:"number",
               width: "120"
             },
@@ -206,6 +210,7 @@ import {number} from "echarts";
               label: "通风度",
               prop: "ventilation",
               cell:true,
+              controls:false,
               type:"number",
               width: "120"
             },
@@ -213,6 +218,7 @@ import {number} from "echarts";
               label: "湿度",
               prop: "humidity",
               cell:true,
+              controls:false,
               type:"number",
               width: "120"
             },

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

@@ -189,13 +189,15 @@
                     <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"
+                              :controls="false" :precision="2"
+                              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.edit" type="number" v-model="row.quantity" size="small" :min="1"
-                              placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
+                    <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1"
+                              :controls="false" :precision="0"
+                              placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{row.quantity}}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -204,8 +206,8 @@
                     <span v-else>{{row.remarks}}</span>
                 </template>
                 <template slot-scope="scope" slot="menu">
-                    <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'D')">保存</el-button>
-                    <el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="editDfun(scope.row,scope.index)">编辑</el-button>
+                    <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'D')">保存</el-button>-->
+                    <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="editDfun(scope.row,scope.index)">编辑</el-button>-->
                     <el-button type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="deletefun(scope.row,scope.index,'D')">删除</el-button>
                 </template>
             </avue-crud>
@@ -360,13 +362,15 @@
                     <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"
+                              :controls="false" :precision="2"
+                              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.edit" type="number" v-model="row.quantity" size="small" :min="1"
-                              placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
+                    <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1"
+                              :controls="false" :precision="0"
+                              placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{row.quantity}}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -375,8 +379,8 @@
                     <span v-else>{{row.remarks}}</span>
                 </template>
                 <template slot-scope="scope" slot="menu">
-                    <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'C')">保存</el-button>
-                    <el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="editCfun(scope.row,scope.index)">编辑</el-button>
+                    <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'C')">保存</el-button>-->
+                    <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="editCfun(scope.row,scope.index)">编辑</el-button>-->
                     <el-button type="text" size="small" :disabled="scope.row.accStatus || detailData.seeDisabled || pleasereviewType" @click="deletefun(scope.row,scope.index,'C')">删除</el-button>
                 </template>
             </avue-crud>
@@ -594,6 +598,7 @@
     import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
     import {getList as reportsList} from "@/api/iosBasicData/reports";
     import {dateFormat} from "@/util/date";
+    import {regularBurdenfloating} from "@/util/regularJudgment";
 
     export default {
         components: {reportContainer, SearchQuery,reportformsList},

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

@@ -91,7 +91,11 @@
       businessValue:{
         type:String,
         default:''
-      }
+      },
+      queryCode:{
+        type:String,
+          default:''
+      },
     },
     data() {
       return {

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -1271,19 +1271,16 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 if (this.form.cargoType = 'dry') {
                     // 普货
                     this.form.billNoFormat = 'HYCK-PH'
-                    this.form.businessTypeCode = 'HYCK-PH'
                 }else if (this.form.cargoType = 'danger'){
                     // 危险品
                     this.form.billNoFormat = 'HYCK-WXP'
-                    this.form.businessTypeCode = 'HYCK-WXP'
                 }else if (this.form.cargoType = 'reefer') {
                     // 冻柜
                     this.form.billNoFormat = 'HYCK-DG'
-                    this.form.businessTypeCode = 'HYCK-DG'
                 }else {
                     this.form.billNoFormat = 'HYCK'
-                    this.form.businessTypeCode = 'HYCK'
                 }
+                this.form.businessTypeCode = 'HYCK'
                 // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
                 this.searchSplit()
                 // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩

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

@@ -319,36 +319,31 @@
               </template>
 
               <template slot="menuLeft">
-                  <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新建业务
+                  <el-button type="primary" size="small" @click="addbtnfun()">新建业务
                   </el-button>
                   <el-button type="primary"
                              size="small"
-                             icon="el-icon-delete"
                              plain @click="CopyDocumentsfun">复制单据
                   </el-button>
                   <el-button type="success"
                              size="small"
-                             icon="el-icon-plus"
                              plain
                              @click="increaseMawb">分单->主单
                   </el-button>
                   <el-button type="warning"
                              size="small"
-                             icon="el-icon-delete"
                              plain
                              v-if="query.billStatus == 0"
                              @click="Disembarkingfun">退 舱
                   </el-button>
                   <el-button type="primary"
                              size="small"
-                             icon="el-icon-delete"
                              plain
                              v-if="query.billStatus == 1"
                              @click="revokeWithdrawalfun" >撤销退舱
                   </el-button>
                   <el-button type="danger"
                              size="small"
-                             icon="el-icon-delete"
                              plain
                              v-if="query.billStatus != 3"
                              @click="handleDelete">删 除

src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -468,11 +468,11 @@ export default {
             // 业务类型 数据
             origSeaTypeData: [
                 {
-                    label: '海运出口',
+                    label: '出口',
                     value: 'E'
                 },
                 {
-                    label: '海运进口',
+                    label: '进口',
                     value: 'I'
                 }
             ],

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

@@ -585,6 +585,9 @@
             },
             // 费用信息明细保存按钮
             feecenterSubmitListfun(){
+                if (!this.form.id) {
+                    return this.$message.warning('请先保存数据')
+                }
                 // 判断必填项
                 let sum = '请输入'
                 for (let item of this.tableData) {

src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -468,11 +468,11 @@ export default {
             // 业务类型 数据
             origSeaTypeData: [
                 {
-                    label: '海运出口',
+                    label: '出口',
                     value: 'E'
                 },
                 {
-                    label: '海运进口',
+                    label: '进口',
                     value: 'I'
                 }
             ],

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

@@ -585,6 +585,9 @@
             },
             // 费用信息明细保存按钮
             feecenterSubmitListfun(){
+                if (!this.form.id) {
+                    return this.$message.warning('请先保存数据')
+                }
                 // 判断必填项
                 let sum = '请输入'
                 for (let item of this.tableData) {

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -380,7 +380,7 @@
                                 </el-col>
                                 <el-col :span="4">
                                     <el-form-item label="销账" prop="isCleared" label-width="50px">
-                                        <search-query :datalist="allyesnoData"
+                                        <search-query :datalist="isClearedData"
                                                       :selectValue="form.isCleared"
                                                       :clearable="true"
                                                       :disabled="editSave"
@@ -516,7 +516,7 @@
                     billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 对账日期 默认 当天
                     isApproved:'0',
                     isSignfor:'0',
-                    isCleared:'0',
+                    isCleared:null, // 销账
                     isChecked:'0',
                     isInvoice:'0',
                     accountDate:[],
@@ -525,7 +525,7 @@
                 handleSelectionData:[], // 表格选择的数据
                 corpData:[], // 对账单位 数据
                 allyesnoData:[], // 全部是否字典数据
-                // isClearedData:[], // 销项
+                isClearedData:[], // 销项
                 isInvoiceData:[],// 发票字典
                 // 收 / 付
                 dcData:[
@@ -1015,10 +1015,10 @@
                 getWorkDicts('all_yes_no').then(res=>{
                     this.allyesnoData = res.data.data;
                 })
-                // // 销账(F)
-                // getWorkDicts('write_off_los').then(res=>{
-                //     this.isClearedData = res.data.data;
-                // })
+                // 销账(F)
+                getWorkDicts('write_off_los').then(res=>{
+                    this.isClearedData = [{dictValue:'全部', dictKey:null},...res.data.data]
+                })
             },
 
             // 获取发票的字典数据

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -8,6 +8,9 @@
             </div>
             <div class="add-customer-btn">
                 <el-button size="small" style="margin-right: 8px"
+                           :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
+                </el-button>
+                <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4" :disabled="!form.id"
@@ -219,7 +222,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="10">
+                        <el-col :span="8">
                             <el-form-item label="备注:" prop="remarks">
                                 <el-input style="width: 100%;" v-model="form.remarks" type="textarea"
                                           size="small" autocomplete="off"
@@ -227,8 +230,11 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="4">
-                            <el-form-item label="" prop="billNo" label-width="50px">
+                        <el-col :span="6">
+                            <el-form-item label-width="50px">
+                                <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
+                                           :loading="saveLoading" @click="emptyConditionfun">一键清空
+                                </el-button>
                                 <el-button size="small" type="primary" style="margin-right: 8px" :disabled="form.id"
                                            :loading="saveLoading" @click="retrievalfun">提取原业务信息
                                 </el-button>
@@ -344,6 +350,24 @@
             </span>
         </el-dialog>
 
+        <!--预览-->
+        <el-dialog
+            title="打印"
+            :visible.sync="selectPrintingDialog"
+            append-to-body
+            width="70%"
+            :close-on-click-modal="false"
+            :destroy-on-close="true"
+            :close-on-press-escape="false"
+            v-dialog-drag>
+            <div>
+                <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>
+            </span>
+        </el-dialog>
+
         <!--费用打印-->
         <reportContainer ref="reportContainer"></reportContainer>
     </div>
@@ -365,9 +389,11 @@ import {
 import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 import {reportsGetReportData} from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
+import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
+import {getList as getreportsList} from "@/api/iosBasicData/reports";
 
 export default {
-    components: {reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated},
+    components: {reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated},
     data() {
         return {
             retrievePopupsType: false, // 检索完的弹窗
@@ -468,11 +494,11 @@ export default {
             // 业务类型 数据
             origSeaTypeData: [
                 {
-                    label: '海运出口',
+                    label: '出口',
                     value: 'E'
                 },
                 {
-                    label: '海运进口',
+                    label: '进口',
                     value: 'I'
                 }
             ],
@@ -530,6 +556,7 @@ export default {
                     },
                 ]
             },
+            selectPrintingDialog:false, // 预览弹窗
         }
     },
     watch:{
@@ -548,12 +575,52 @@ export default {
         },
     },
     methods: {
+        // 报表预览
+        previewreportfun(){
+            getreportsList(1,10,{
+                businessType:'AMEND',
+                classifyCode:'AMEND',
+                groupCode:'SE'
+            }).then(res=>{
+                if (res.data.data.records.length == 1) {
+                    this.reportRadio(res.data.data.records[0])
+                }else {
+                    this.saveLoading = true
+                    this.selectPrintingDialog = true
+                    this.saveLoading = false
+                    let page = {
+                        pageSize: 10,
+                        currentPage: 1,
+                        total: 0
+                    }
+                    this.$nextTick(()=>{
+                        this.$refs.reportformsList.onLoad(page,{
+                            businessType:'AMEND',
+                            classifyCode:'AMEND',
+                            groupCode:'SE'
+                        })
+                    })
+                }
+            })
+        },
         // 打印表格选择
         reportNodeClick(data){
             this.reportformsObj = data
             this.printingLoading = true
             this.getFeeCenterCorpIdsfun()
         },
+        // 预览里的打印
+        reportRadio(val){
+            // 获取报表数据
+            reportsGetReportData({
+                billId:this.form.id,
+                reportCode:val.classifyCode,
+                groupCode:val.groupCode,
+                type:'AMEND'
+            }).then(res=>{
+                this.handleReportPreview(val.url,res.data.data.data)
+            })
+        },
         // 费用弹窗里的打印
         dialogPreviewfun(row){
             if (!this.reportformsObj.id){
@@ -651,12 +718,6 @@ export default {
                 arr = this.multipleChoiceDArr
             } else {
                 arr = this.multipleChoiceCArr
-                // for (let item of this.multipleChoiceCArr) {
-                //     item.amendSrcItemId = item.id
-                //     delete item.id
-                //     this.form.feeCenterList.unshift(item)
-                // }
-                // this.form.feeCenterList.unshift(...this.multipleChoiceCArr)
             }
             for (let item of arr) {
                 item.amendSrcItemId = item.id
@@ -733,7 +794,7 @@ export default {
                 delete item.voucherDate
                 delete item.voucherNo
                 delete item.voucherStatus
-                this.form.feeCenterList.unshift(item)
+                this.form.feeCenterList.unshift(JSON.parse(JSON.stringify(item)))
             }
             this.editType = true
         },
@@ -1073,8 +1134,27 @@ export default {
                 })
             })
         },
+        // 清空搜索条件
+        emptyConditionfun(){
+            this.$confirm("您确定要清空搜索条件吗?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(res=>{
+                this.form = {
+                    voucherDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                    feeCenterListD: [],
+                    feeCenterListC: [],
+                    feeCenterList:[]
+                }
+            })
+        },
         // 检索
         retrievalfun() {
+            // 判断是否有客户名称
+            if (this.form.corpCnName) {
+                return this.$message.warning('请先一键清空数据之后再进行提取信息')
+            }
             if (!this.form.mblno && !this.form.hblno && !this.form.refno && !this.form.bookingNo) {
                 return this.$message.warning('请填写至少一项检索条件')
             }

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

@@ -370,6 +370,10 @@
             },
             // 一键删除
             batchDelete(){
+                if (this.handleSelectionData.length === 0) {
+                    this.$message.warning("请选择至少一条数据");
+                    return;
+                }
                 this.$confirm("确定将选择数据删除?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
@@ -585,6 +589,9 @@
             },
             // 费用信息明细保存按钮
             feecenterSubmitListfun(){
+                if (!this.form.id) {
+                    return this.$message.warning('请先保存数据')
+                }
                 // 判断必填项
                 let sum = '请输入'
                 for (let item of this.tableData) {

src/views/iosBasicData/seamends/index.vue

@@ -52,7 +52,7 @@
                   </el-button>
               </template>
               <template slot="billNo" slot-scope="{ row }">
-                  <span style="color: #1e9fff;" @click="rowEdit(row)">{{row.billNo}}</span>
+                  <span style="color: #1e9fff;cursor:pointer;" @click="rowEdit(row)">{{row.billNo}}</span>
               </template>
           </avue-crud>
       </basic-container>

src/views/iosBasicData/siamends/amendsDetails.vue

@@ -8,6 +8,9 @@
             </div>
             <div class="add-customer-btn">
                 <el-button size="small" style="margin-right: 8px"
+                           :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
+                </el-button>
+                <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4" :disabled="!form.id"
@@ -219,7 +222,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="10">
+                        <el-col :span="8">
                             <el-form-item label="备注:" prop="remarks">
                                 <el-input style="width: 100%;" v-model="form.remarks" type="textarea"
                                           size="small" autocomplete="off"
@@ -227,8 +230,11 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="4">
+                        <el-col :span="6">
                             <el-form-item label="" prop="billNo" label-width="50px">
+                                <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
+                                           :loading="saveLoading" @click="emptyConditionfun">一键清空
+                                </el-button>
                                 <el-button size="small" type="primary" style="margin-right: 8px" :disabled="form.id"
                                            :loading="saveLoading" @click="retrievalfun">提取原业务信息
                                 </el-button>
@@ -468,11 +474,11 @@ export default {
             // 业务类型 数据
             origSeaTypeData: [
                 {
-                    label: '海运出口',
+                    label: '出口',
                     value: 'E'
                 },
                 {
-                    label: '海运进口',
+                    label: '进口',
                     value: 'I'
                 }
             ],
@@ -548,6 +554,46 @@ export default {
         },
     },
     methods: {
+        // 报表预览
+        previewreportfun(){
+            getreportsList(1,10,{
+                businessType:'AMEND',
+                classifyCode:'AMEND',
+                groupCode:'SI'
+            }).then(res=>{
+                if (res.data.data.records.length == 1) {
+                    this.reportRadio(res.data.data.records[0])
+                }else {
+                    this.saveLoading = true
+                    this.selectPrintingDialog = true
+                    this.saveLoading = false
+                    let page = {
+                        pageSize: 10,
+                        currentPage: 1,
+                        total: 0
+                    }
+                    this.$nextTick(()=>{
+                        this.$refs.reportformsList.onLoad(page,{
+                            businessType:'AMEND',
+                            classifyCode:'AMEND',
+                            groupCode:'SI'
+                        })
+                    })
+                }
+            })
+        },
+        // 预览里的打印
+        reportRadio(val){
+            // 获取报表数据
+            reportsGetReportData({
+                billId:this.form.id,
+                reportCode:val.classifyCode,
+                groupCode:val.groupCode,
+                type:'AMEND'
+            }).then(res=>{
+                this.handleReportPreview(val.url,res.data.data.data)
+            })
+        },
         // 打印表格选择
         reportNodeClick(data){
             this.reportformsObj = data
@@ -649,19 +695,8 @@ export default {
             let arr = []
             if (dc == 'D') {
                 arr = this.multipleChoiceDArr
-                // for (let item of this.multipleChoiceDArr) {
-                //     item.amendSrcItemId = item.id
-                //     delete item.id
-                //     this.form.feeCenterList.unshift(item)
-                // }
             } else {
                 arr = this.multipleChoiceCArr
-                // for (let item of this.multipleChoiceCArr) {
-                //     item.amendSrcItemId = item.id
-                //     delete item.id
-                //     this.form.feeCenterList.unshift(item)
-                // }
-                // this.form.feeCenterList.unshift(...this.multipleChoiceCArr)
             }
             for(let item of arr) {
                 item.accStatus = 0
@@ -737,7 +772,7 @@ export default {
                 delete item.voucherDate
                 delete item.voucherNo
                 delete item.voucherStatus
-                this.form.feeCenterList.unshift(item)
+                this.form.feeCenterList.unshift(JSON.parse(JSON.stringify(item)))
             }
             this.editType = true
         },
@@ -1076,8 +1111,27 @@ export default {
                 })
             })
         },
+        // 清空搜索条件
+        emptyConditionfun(){
+            this.$confirm("您确定要清空搜索条件吗?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(res=>{
+                this.form = {
+                    voucherDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                    feeCenterListD: [],
+                    feeCenterListC: [],
+                    feeCenterList:[]
+                }
+            })
+        },
         // 检索
         retrievalfun() {
+            // 判断是否有客户名称
+            if (this.form.corpCnName) {
+                return this.$message.warning('请先一键清空数据之后再进行提取信息')
+            }
             if (!this.form.mblno && !this.form.hblno && !this.form.refno && !this.form.bookingNo) {
                 return this.$message.warning('请填写至少一项检索条件')
             }

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

@@ -370,6 +370,10 @@
             },
             // 一键删除
             batchDelete(){
+                if (this.handleSelectionData.length === 0) {
+                    this.$message.warning("请选择至少一条数据");
+                    return;
+                }
                 this.$confirm("确定将选择数据删除?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
@@ -585,6 +589,9 @@
             },
             // 费用信息明细保存按钮
             feecenterSubmitListfun(){
+                if (!this.form.id) {
+                    return this.$message.warning('请先保存数据')
+                }
                 // 判断必填项
                 let sum = '请输入'
                 for (let item of this.tableData) {

src/views/iosBasicData/siamends/index.vue

@@ -52,7 +52,7 @@
                   </el-button>
               </template>
               <template slot="billNo" slot-scope="{ row }">
-                  <span style="color: #1e9fff;" @click="rowEdit(row)">{{row.billNo}}</span>
+                  <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{row.billNo}}</span>
               </template>
           </avue-crud>
       </basic-container>