财务管理添加结算人 审核人 制单人检索条件

src/views/iosBasicData/ComputationCenter/index.vue

@@ -224,11 +224,11 @@ export default {
                         search: true,
                         overHidden: true,
                     },
-                    {
-                        label: "申请人",
-                        prop: "createUserName",
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "申请人",
+                    //     prop: "createUserName",
+                    //     overHidden: true,
+                    // },
                     {
                         label: "结算日期",
                         prop: "billDate",
@@ -345,6 +345,22 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "结算人",
+                        prop: "createUserName",
+                        width: "100",
+                        search: false,
+                        hide: true,
+                        overHidden: true,
+                    },
+                    {
+                        label: "核销人",
+                        prop: "createUserNames",
+                        width: "100",
+                        search: true,
+                        hide: false,
+                        overHidden: true,
+                    },
+                    {
                         label: "JOB NO",
                         prop: "businessNo",
                         width: "120",
@@ -383,6 +399,26 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "发票汇率",
+                        prop: "exrate",
+                        overHidden: true,
+                        hide: true,
+                    },
+                    {
+                        label: "是否转人民币",
+                        prop: "isExchangeToCny",
+                        overHidden: true,
+                        hide: true,
+                        width: "100",
+                        dicData: [{
+                            label: '否',
+                            value: '0'
+                        }, {
+                            label: '是',
+                            value: '1'
+                        }]
+                    },
+                    {
                         label: "本币",
                         prop: "amountSub",
                         overHidden: true,
@@ -592,7 +628,29 @@ export default {
         },
         // tabs 切换
         handleClick() {
-            if (this.tabsValue == 'D') {
+            if (this.tabsValue == 'C') {
+                this.findObject(this.option.column, "createUserName").hide = true
+                this.findObject(this.option.column, "createUserName").search = false
+                this.findObject(this.option.column, "createUserNames").hide = false
+                this.findObject(this.option.column, "createUserNames").search = true
+                this.findObject(this.option.column, "exrate").hide = true
+                this.findObject(this.option.column, "isExchangeToCny").hide = true
+                this.findObject(this.option.column, "invCorpCnName").hide = true
+                this.findObject(this.option.column, "type").hide = true
+                this.findObject(this.option.column, "businessType").hide = false
+                this.findObject(this.option.column, "billDateStart").search = true
+                this.findObject(this.option.column, "billDateEnd").search = true
+                this.findObject(this.option.column, "businessDateStart").search = true
+                this.findObject(this.option.column, "businessDateEnd").search = true
+                this.findObject(this.option.column, "invoiceDateStart").search = false
+                this.findObject(this.option.column, "invoiceDateEnd").search = false
+            } else if (this.tabsValue == 'D') {
+                this.findObject(this.option.column, "createUserName").hide = false
+                this.findObject(this.option.column, "createUserName").search = true
+                this.findObject(this.option.column, "createUserNames").hide = true
+                this.findObject(this.option.column, "createUserNames").search = false
+                this.findObject(this.option.column, "exrate").hide = false
+                this.findObject(this.option.column, "isExchangeToCny").hide = false
                 this.findObject(this.option.column, "invCorpCnName").hide = false
                 this.findObject(this.option.column, "type").hide = false
                 this.findObject(this.option.column, "businessType").hide = true
@@ -602,9 +660,11 @@ export default {
                 this.findObject(this.option.column, "businessDateEnd").search = false
                 this.findObject(this.option.column, "invoiceDateStart").search = true
                 this.findObject(this.option.column, "invoiceDateEnd").search = true
-
-
             } else {
+                this.findObject(this.option.column, "createUserName").hide = false
+                this.findObject(this.option.column, "createUserName").search = true
+                this.findObject(this.option.column, "createUserNames").hide = false
+                this.findObject(this.option.column, "createUserNames").search = true
                 this.findObject(this.option.column, "invCorpCnName").hide = true
                 this.findObject(this.option.column, "type").hide = true
                 this.findObject(this.option.column, "businessType").hide = false

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -193,6 +193,13 @@
                                                 </el-input>
                                             </el-form-item>
                                         </el-col>
+                                        <el-col :span="5" v-if="settlementType != 'C'">
+                                            <el-form-item label="发票汇率" prop="exrate">
+                                                <el-input style="width: 100%;" v-model="form.exrate" size="small"
+                                                    autocomplete="off" :disabled="true" clearable placeholder="请输入发票汇率">
+                                                </el-input>
+                                            </el-form-item>
+                                        </el-col>
                                     </el-row>
 
 
@@ -233,6 +240,10 @@
                                             <!--<el-button  size="small" type="" style="margin-right: 8px" :disabled="settlementdistar || editSave"-->
                                             <!--            :loading="saveLoading" @click="ResetFilter">重置条件-->
                                             <!--</el-button>-->
+                                            <el-checkbox v-if="settlementType != 'C'" style="margin-left: 10%" size="medium" true-label="1"
+                                                false-label="0" :disabled="true"
+                                                v-model="form.isExchangeToCny">转换成人民币
+                                            </el-checkbox>
                                             <el-checkbox v-model="appendType" :disabled="settlementdistar || editSave"
                                                 false-label="检索" true-label="追加">追加</el-checkbox>
                                             <el-button size="small" type="primary"
@@ -404,6 +415,7 @@ export default {
     },
     data() {
         return {
+            settlementType: null,
             roleName: localStorage.getItem("roleName"),
             amountSubSum: 0,
             amountSubUsdSum: 0,

src/views/iosBasicData/PaymentApplication/index.vue

@@ -86,7 +86,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         searchIcon: true,
         searchIndex: 3,
         border: true,
@@ -378,6 +378,12 @@ export default {
             overHidden: true
           },
           {
+            label: "制单人",
+            prop: "createUserName",
+            search:true,
+            overHidden: true,
+          },
+          {
             label: "JOB NO",
             prop: "businessNo",
             width: "120",
@@ -463,7 +469,7 @@ export default {
     this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     this.option = await this.getColumnData(this.getColumnName(316.1), this.optionBack);
     if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-      this.option.searchMenuSpan = 24
+      this.option.searchMenuSpan = 18
       this.option.column.forEach(item => {
         if (item.prop == 'branchId') {
           item.search = true
@@ -767,7 +773,7 @@ export default {
       this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-        this.option.searchMenuSpan = 24
+        this.option.searchMenuSpan = 18
         this.option.column.forEach(item => {
           if (item.prop == 'branchId') {
             item.search = true

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -436,7 +436,7 @@
                                     <span>开票本币合计:{{ form.amountLoc ? form.amountLoc : '0.00' }}</span>
                                 </div>
                                 <div style="width: 60%;display: flex;justify-content:flex-end;align-items: center;">
-                                    <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
+                                    <el-checkbox style="margin-left: 10%" size="medium" true-label="1" false-label="0"
                                         :disabled="editSave" v-model="form.isExchangeToCny">转换成本币
                                     </el-checkbox>
                                     <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索"
@@ -615,7 +615,7 @@ export default {
                 isRp: 1,
                 invType: '全电发票',
                 taxRate: 0,
-                isExchangeToCny: 0,
+                isExchangeToCny: '0',
                 invoiceDate: getCurrentDate(),
             },
             tableData: [], // 费用明细数据
@@ -729,7 +729,7 @@ export default {
                 isRp: 1,
                 invType: '全电发票',
                 taxRate: 0,
-                isExchangeToCny: 0,
+                isExchangeToCny: '0',
                 invoiceDate: getCurrentDate(),
             }
             getRateList({ current: 1, size: 30 }).then(res => {

src/views/iosBasicData/fininvoices/index.vue

@@ -385,10 +385,10 @@ export default {
             width: 140,
             dicData: [{
               label: '否',
-              value: 0
+              value: '0'
             }, {
               label: '是',
-              value: 1
+              value: '1'
             }],
             overHidden: true,
           },
@@ -649,7 +649,7 @@ export default {
     this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     this.option = await this.getColumnData(this.getColumnName(318), this.optionBack);
     if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-      this.option.searchMenuSpan = 6
+      this.option.searchMenuSpan = 24
       this.option.column.forEach(item => {
         if (item.prop == 'branchId') {
           item.search = true
@@ -855,7 +855,7 @@ export default {
       this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-        this.option.searchMenuSpan = 6
+        this.option.searchMenuSpan = 24
         this.option.column.forEach(item => {
           if (item.prop == 'branchId') {
             item.search = true

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -423,7 +423,7 @@
                                     <span>开票本币合计:{{ form.amountLoc ? form.amountLoc : '0.00' }}</span>
                                 </div>
                                 <div style="width: 60%;display: flex;justify-content:flex-end;align-items: center;">
-                                    <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
+                                    <el-checkbox style="margin-left: 10%" size="medium" true-label="1" false-label="0"
                                         :disabled="editSave" v-model="form.isExchangeToCny">转换成本币
                                     </el-checkbox>
                                     <el-checkbox v-model="appendType" :disabled="statusType" false-label="检索"
@@ -675,7 +675,7 @@ export default {
                 invType: '全电发票',
                 taxRate: 0,
                 invoiceDate: getCurrentDate(),
-                isExchangeToCny: 0,
+                isExchangeToCny: '0',
                 billDate: getCurrentDate(),
             },
             tableData: [], // 费用明细数据
@@ -797,7 +797,7 @@ export default {
                 invType: '全电发票',
                 taxRate: 0,
                 invoiceDate: getCurrentDate(),
-                isExchangeToCny: 0,
+                isExchangeToCny: '0',
                 billDate: getCurrentDate(),
             }
             this.$set(this.form, 'exrate', this.getExchangeRate(this.getLocalCurrency(), this.form.dc ? this.form.dc : 'D', 2))

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -88,7 +88,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 18,
         searchIcon: true,
         searchIndex: 3,
         border: true,
@@ -199,6 +199,7 @@ export default {
           {
             label: "制单人",
             prop: "createUserName",
+            search: true,
             overHidden: true,
           }, {
             label: "制单日期",
@@ -652,7 +653,7 @@ export default {
     this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     this.option = await this.getColumnData(this.getColumnName(320), this.optionBack);
     if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-      this.option.searchMenuSpan = 18
+      this.option.searchMenuSpan = 12
       this.option.column.forEach(item => {
         if (item.prop == 'branchId') {
           item.search = true
@@ -896,7 +897,7 @@ export default {
       this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-        this.option.searchMenuSpan = 18
+        this.option.searchMenuSpan = 12
         this.option.column.forEach(item => {
           if (item.prop == 'branchId') {
             item.search = true

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -446,7 +446,7 @@
                                     <span>开票本币合计:{{ form.amountLoc ? form.amountLoc : '0.00' }}</span>
                                 </div>
                                 <div style="width: 60%;display: flex;justify-content:flex-end;align-items: center;">
-                                    <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
+                                    <el-checkbox style="margin-left: 10%" size="medium" true-label="1" false-label="0"
                                         :disabled="editSave" v-model="form.isExchangeToCny">转换成人民币
                                     </el-checkbox>
                                     <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索"
@@ -675,7 +675,7 @@ export default {
                 isRp: 1,
                 invType: '全电发票',
                 taxRate: 0,
-                isExchangeToCny: 0,
+                isExchangeToCny: '0',
                 invoiceDate: getCurrentDate(),
             },
             tableData: [], // 费用明细数据
@@ -794,7 +794,7 @@ export default {
                 isRp: 1,
                 invType: '全电发票',
                 taxRate: 0,
-                isExchangeToCny: 0,
+                isExchangeToCny: '0',
                 invoiceDate: getCurrentDate(),
             }
             getRateList({ current: 1, size: 30 }).then(res => {

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -142,7 +142,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 18,
                 searchIcon: true,
                 searchIndex: 3,
                 border: true,
@@ -213,6 +213,12 @@ export default {
                         prop: "billDate",
                         overHidden: true,
                     },
+                    {
+                        label: "制单人",
+                        prop: "createUserName",
+                        search: true,
+                        overHidden: true,
+                    },
                     // {
                     //     label: "单据开始日期",
                     //     prop: "invoiceDateStart",
@@ -337,7 +343,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 18,
                 searchIcon: true,
                 searchIndex: 3,
                 border: true,
@@ -437,8 +443,10 @@ export default {
                     {
                         label: "制单人",
                         prop: "createUserName",
+                        search: true,
                         overHidden: true,
-                    }, {
+                    }
+                    , {
                         label: "制单日期",
                         prop: "createTime",
                         overHidden: true,
@@ -659,10 +667,10 @@ export default {
                         width: "140",
                         dicData: [{
                             label: '否',
-                            value: 0
+                            value: '0'
                         }, {
                             label: '是',
-                            value: 1
+                            value: '1'
                         }],
                         overHidden: true,
                     },
@@ -922,7 +930,7 @@ export default {
         this.applyOption = await this.getColumnData(this.getColumnName(319), this.applyOptionBack);
         this.option = await this.getColumnData(this.getColumnName(319.1), this.optionBack);
         if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-            this.option.searchMenuSpan = 18
+            this.option.searchMenuSpan = 12
             this.option.column.forEach(item => {
                 if (item.prop == 'branchId') {
                     item.search = true
@@ -932,7 +940,7 @@ export default {
                     item.showColumn = true
                 }
             })
-            this.applyOption.searchMenuSpan = 18
+            this.applyOption.searchMenuSpan = 12
             this.applyOption.column.forEach(item => {
                 if (item.prop == 'branchId') {
                     item.search = true
@@ -1260,7 +1268,7 @@ export default {
             this[option] = this[optionBack];
             const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
             if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-                this.option.searchMenuSpan = 18
+                this.option.searchMenuSpan = 12
                 this.option.column.forEach(item => {
                     if (item.prop == 'branchId') {
                         item.search = true
@@ -1271,7 +1279,7 @@ export default {
                     }
 
                 })
-                this.applyOption.searchMenuSpan = 18
+                this.applyOption.searchMenuSpan = 12
                 this.applyOption.column.forEach(item => {
                     if (item.prop == 'branchId') {
                         item.search = true

src/views/iosBasicData/finstlbills/index.vue

@@ -549,12 +549,12 @@ export default {
           //   prop: "voucherDate",
           //   overHidden: true,
           // },
-          // {
-          //   label: "制单人",
-          //   prop: "createUserName",
-          //   search:true,
-          //   overHidden: true,
-          // },
+          {
+            label: "制单人",
+            prop: "createUserName",
+            search:true,
+            overHidden: true,
+          },
           {
             label: "备注",
             prop: "remarks",

src/views/ow/owTask/detailsPage.vue

@@ -45,13 +45,21 @@
           <trade-card title="基础信息">
             <avue-form :option="optionForm" v-model="form" ref="form">
               <tempalte slot="purchaseCompanyName">
-                <dic-select v-model="form.purchaseCompanyName" placeholder="箱东" key="id" label="shortName" res="records"
+                <dic-select v-model="form.purchaseCompanyName" placeholder="provider" key="id" label="shortName" res="records"
                   @selectChange="dicChange('purchaseCompanyName', $event)"
                   :disabled="editDisabled || (fixData && form.whetherEnable == '是')"
                   url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东" :filterable="true"
                   :remote="true" dataName="shortName" :slotRight="true" rightLabel="code">
                 </dic-select>
               </tempalte>
+              <tempalte slot="ownerName">
+                <dic-select v-model="form.ownerName" placeholder="owner" key="id" label="enName" res="records"
+                  @selectChange="dicChange('ownerName', $event)"
+                  :disabled="editDisabled || (fixData && form.whetherEnable == '是')"
+                  url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东" :filterable="true"
+                  :remote="true" dataName="enName" :slotRight="true" rightLabel="code">
+                </dic-select>
+              </tempalte>
               <!-- <tempalte slot="polStationCname">
                 <dic-select v-model="form.polStationCname" placeholder="起运港提/送箱场站" key="id" label="cnName" res="records"
                   url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true" dataName="cnName"
@@ -819,7 +827,7 @@ export default {
         labelWidth: 120,
         column: [
           {
-            label: '箱东',
+            label: 'provider',
             prop: 'purchaseCompanyName',
             disabled: false,
             rules: [{
@@ -829,6 +837,11 @@ export default {
             }]
           },
           {
+            label: 'owner',
+            prop: 'ownerName',
+            disabled: false,
+          },
+          {
             label: '放箱号',
             prop: 'containerNumber',
             disabled: false,
@@ -839,11 +852,6 @@ export default {
             }]
           },
           {
-            label: '内部放箱号',
-            prop: 'internalContainerNumber',
-            disabled: true
-          },
-          {
             label: '箱况',
             prop: 'boxCondition',
             disabled: false,
@@ -1049,11 +1057,16 @@ export default {
             labelWidth: 180,
           },
           {
+            label: '内部放箱号',
+            prop: 'internalContainerNumber',
+            disabled: true
+          },
+          {
             label: '备注',
             prop: 'remarks',
             type: 'textarea',
             minRows: 2,
-            span: 6
+            span: 12
           }]
       },
       optionForm2: {
@@ -1767,7 +1780,7 @@ export default {
         tip: false,
         selection: true,
         column: [
-             {
+          {
             label: "是否生成",
             prop: "whetherGenerateCost",
             overHidden: true,
@@ -1855,7 +1868,7 @@ export default {
         tip: false,
         selection: true,
         column: [
-             {
+          {
             label: "是否生成",
             prop: "whetherGenerateCost",
             overHidden: true,
@@ -2485,6 +2498,14 @@ export default {
           this.form.purchaseCompanyName = null
         }
       }
+      if(name=='ownerName'){
+        if (row) {
+          this.form.ownerId = row.id
+        } else {
+          this.form.ownerId = null
+          this.form.ownerName = null
+        }
+      }
       if (name == 'polStationCname') {
         if (row) {
           this.form.polStationId = row.id

src/views/ow/owTask/index.vue

@@ -63,7 +63,7 @@ export default {
         menuWidth: 140,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         addBtn: false,
@@ -85,7 +85,7 @@ export default {
         ],
         column: [
           {
-            label: '箱东',
+            label: 'provider',
             prop: 'purchaseCompanyName',
             width: 150,
             overHidden: true,
@@ -102,6 +102,24 @@ export default {
               res: "data.records"
             },
           },
+           {
+            label: 'owner',
+            prop: 'ownerName',
+            width: 150,
+            overHidden: true,
+            search: true,
+            searchOrder: 7,
+            type: "select",
+            filterable: true,
+            remote: true,
+            dicUrl: "/api/blade-los/bcorps/selectList?status=0&corpTypeName=箱东&size=5&current=1&shortName={{key}}",
+            props: {
+              label: "enName",
+              value: "enName",
+              desc: 'code',
+              res: "data.records"
+            },
+          },
           {
             label: '启用',
             prop: 'whetherEnable',