Browse Source

Merge remote-tracking branch 'origin/dev' into dev

liyuan 2 months ago
parent
commit
12325482e1

File diff suppressed because it is too large
+ 721 - 156
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue


File diff suppressed because it is too large
+ 432 - 241
src/views/iosBasicData/OceanFreightImport/bills/index.vue


File diff suppressed because it is too large
+ 405 - 189
src/views/iosBasicData/SeafreightExportF/bills/index.vue


+ 16 - 16
src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -236,18 +236,10 @@
                                             </search-query>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="费用名称" prop="feeCnName">
-                                            <dic-select v-model="form.feeCnName" placeholder="费用名称" key="id"
-                                                label="cnName" url="/blade-los/bfees/listAll" :filterable="true"
-                                                :multiple="true" :collapseTags="true" :disabled="editSave"></dic-select>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="税控发票号" prop="taxInvoiceNo">
-                                            <el-input style="width: 100%;" v-model="form.taxInvoiceNo" size="small"
-                                                autocomplete="off" :disabled="editSave" clearable
-                                                placeholder="请输入税控发票号">
+                                    <el-col :span="16">
+                                        <el-form-item label="全电发票:" prop="elecRemarks">
+                                            <el-input style="width: 100%;" v-model="form.elecRemarks" size="small"   :autosize="{ minRows: 1, maxRows: 2}"
+                                                autocomplete="off" type="textarea" clearable placeholder="请输入全电发票备注">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -364,10 +356,18 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="24">
-                                        <el-form-item label="全电发票:" prop="elecRemarks">
-                                            <el-input style="width: 100%;" v-model="form.elecRemarks" size="small"
-                                                autocomplete="off" type="textarea" clearable placeholder="请输入全电发票备注">
+                                    <el-col :span="8">
+                                        <el-form-item label="费用名称" prop="feeCnName">
+                                            <dic-select v-model="form.feeCnName" placeholder="费用名称" key="id"
+                                                label="cnName" url="/blade-los/bfees/listAll" :filterable="true"
+                                                :multiple="true" :collapseTags="true" :disabled="editSave"></dic-select>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="16">
+                                        <el-form-item label="税控发票号" prop="taxInvoiceNo">
+                                            <el-input style="width: 100%;" v-model="form.taxInvoiceNo" size="small"
+                                                autocomplete="off" :disabled="editSave" clearable
+                                                placeholder="请输入税控发票号">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>

File diff suppressed because it is too large
+ 382 - 227
src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue


+ 23 - 21
src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -236,18 +236,11 @@
                                             </search-query>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="费用名称" prop="feeCnName">
-                                            <dic-select v-model="form.feeCnName" placeholder="费用名称" key="id"
-                                                label="cnName" url="/blade-los/bfees/listAll" :filterable="true"
-                                                :multiple="true" :collapseTags="true" :disabled="editSave"></dic-select>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="税控发票号" prop="taxInvoiceNo">
-                                            <el-input style="width: 100%;" v-model="form.taxInvoiceNo" size="small"
-                                                autocomplete="off" :disabled="editSave" clearable
-                                                placeholder="请输入税控发票号">
+                                    <el-col :span="16">
+                                        <el-form-item label="全电发票" prop="elecRemarks">
+                                            <el-input style="width: 100%;" v-model="form.elecRemarks" size="small"
+                                                :autosize="{ minRows: 1, maxRows: 2 }" autocomplete="off" type="textarea"
+                                                clearable placeholder="请输入全电发票备注">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -364,13 +357,22 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="24">
-                                        <el-form-item label="全电发票:" prop="elecRemarks">
-                                            <el-input style="width: 100%;" v-model="form.elecRemarks" size="small"
-                                                autocomplete="off" type="textarea" clearable placeholder="请输入全电发票备注">
+                                    <el-col :span="8">
+                                        <el-form-item label="费用名称" prop="feeCnName">
+                                            <dic-select v-model="form.feeCnName" placeholder="费用名称" key="id"
+                                                label="cnName" url="/blade-los/bfees/listAll" :filterable="true"
+                                                :multiple="true" :collapseTags="true" :disabled="editSave"></dic-select>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="16">
+                                        <el-form-item label="税控发票号" prop="taxInvoiceNo">
+                                            <el-input style="width: 100%;" v-model="form.taxInvoiceNo" size="small"
+                                                autocomplete="off" :disabled="editSave" clearable
+                                                placeholder="请输入税控发票号">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
+
                                 </el-row>
                             </div>
                         </el-col>
@@ -1342,10 +1344,10 @@ export default {
                 this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(',') : []
                 this.tableData = this.form.finInvoicesItemsList.map(item => {
                     if (item.currentCurCode == 'CNY') {
-                        this.$set(item, 'currentAmountCNY', Number(item.currentAmount?item.currentAmount:0))
-                        this.$set(item, 'currentAmountUSD',  Number(0))
+                        this.$set(item, 'currentAmountCNY', Number(item.currentAmount ? item.currentAmount : 0))
+                        this.$set(item, 'currentAmountUSD', Number(0))
                     } else {
-                        this.$set(item, 'currentAmountUSD', Number(item.currentAmount?item.currentAmount:0))
+                        this.$set(item, 'currentAmountUSD', Number(item.currentAmount ? item.currentAmount : 0))
                         this.$set(item, 'currentAmountCNY', Number(0))
                     }
                     return item
@@ -1372,10 +1374,10 @@ export default {
                 if (Array.isArray(this.form.finInvoicesItemsList)) {
                     this.tableData = this.form.finInvoicesItemsList.map(item => {
                         if (item.currentCurCode == 'CNY') {
-                            item.currentAmountCNY = Number(item.currentAmount?item.currentAmount:0)
+                            item.currentAmountCNY = Number(item.currentAmount ? item.currentAmount : 0)
                             item.currentAmountUSD = Number(0)
                         } else {
-                            item.currentAmountUSD = Number(item.currentAmount?item.currentAmount:0)
+                            item.currentAmountUSD = Number(item.currentAmount ? item.currentAmount : 0)
                             item.currentAmountCNY = Number(0)
                         }
 

File diff suppressed because it is too large
+ 604 - 538
src/views/system/dept.vue


+ 3 - 3
vue.config.js

@@ -50,12 +50,12 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.8.104:1080',
+        // target: 'http://192.168.8.105:1080',
         // target: 'http://127.0.0.1:1080',
         // 打包地址
-        target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://192.168.161.11:10004',//服务器ip
-        //  target: 'http://127.0.0.1:10004',
+         target: 'http://127.0.0.1:10004',
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {

Some files were not shown because too many files changed in this diff