修改费用修改和删除 开账新加所属公司

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

@@ -83,11 +83,11 @@
                         @click="allClick('D费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D撤销请核')">撤销请核</el-button>
-                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1 || disabled"
+                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1 || showLock"
                         @click="allClick('D申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1 || disabled"
+                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1 || showLock"
                         @click="allClick('D申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1 || disabled"
+                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1 || showLock"
                         @click="allClick('D取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -239,11 +239,11 @@
                         @click="allClick('C撤销请核')">撤销请核</el-button>
                     <!-- <el-button type="success" plain size="small" :disabled="disabled"
                         @click="allClick('提取成本')">提取成本</el-button> -->
-                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1 || disabled"
+                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1 || showLock"
                         @click="allClick('C申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1 || disabled"
+                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1 || showLock"
                         @click="allClick('C申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1 || disabled"
+                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1 || showLock"
                         @click="allClick('C取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">

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

@@ -84,11 +84,11 @@
                         @click="allClick('D费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D撤销请核')">撤销请核</el-button>
-                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||disabled"
+                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||showLock"
                         @click="allClick('D申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||disabled"
+                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||showLock"
                         @click="allClick('D申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||disabled"
+                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||showLock"
                         @click="allClick('D取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -243,11 +243,11 @@
                         @click="allClick('C撤销请核')">撤销请核</el-button>
                     <!-- <el-button type="success" plain size="small" :disabled="disabled"
                         @click="allClick('提取成本')">提取成本</el-button> -->
-                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||disabled"
+                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||showLock"
                         @click="allClick('C申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||disabled"
+                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||showLock"
                         @click="allClick('C申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||disabled"
+                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||showLock"
                         @click="allClick('C取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">

src/views/iosBasicData/periodManagement/index.vue

@@ -55,9 +55,17 @@
             <span v-if="title == '期间损益汇率'" style="display: flex;align-items: center;">
                 <avue-crud :data="itemData" :option="itemOption"></avue-crud>
             </span>
-            <span v-else-if="title == '开账'" style="display: flex;align-items: center;">
-                开账日期：<avue-date size="small" type="datetime" v-model="openDate" format="yyyy-MM-dd HH:mm:ss"
-                    value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开张日期"></avue-date>
+            <span v-else-if="title == '开账'">
+                <span style="display: flex;align-items: center;">
+                    所属公司：
+                    <dic-select v-model="branchName" placeholder="所属公司" key="id" label="deptName"
+                        url="/blade-system/dept/top-list" :filterable="true" :remote="true" dataName="deptName"
+                        @selectChange="dicChange('branchName', $event)" style="width:220px"></dic-select>
+                </span>
+                <span style="display: flex;align-items: center;">
+                    开账日期：<avue-date size="small" type="datetime" v-model="openDate" format="yyyy-MM-dd HH:mm:ss"
+                        value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开张日期"></avue-date>
+                </span>
             </span>
             <span v-else-if="title == '账套初始化'">
                 <span style="display: flex;align-items: center;">
@@ -598,8 +606,7 @@ export default {
                 type: 'warning'
             }).then(() => {
                 this.loading = true
-                open({ beginDate: this.openDate }).then(res => {
-
+                open({ beginDate: this.openDate,branchId: this.branchId, branchName: this.branchName }).then(res => {
                     this.$message.success("开账成功");
                     this.handleClick(this.activeName)
                     this.handleClose()