ソースを参照

修改合计位置 库存明细帐跳转

Qukatie 4 ヶ月 前
コミット
1f357be358

+ 3 - 1
src/views/iosBasicData/ComputationCenter/index.vue

@@ -30,7 +30,7 @@
                     </el-button>
                     <el-button v-if="tabsValue == '业务单据'" type="danger" size="small" plain @click="handleDelete()">一键删除
                     </el-button>
-                    <span style="font-size: 18px;">
+                    <span style="font-size: 24px;font-weight: 600;">
                         <span style="color: #67C23A;margin-right: 10px;">
                             CNY:¥{{ amountSubSum }}元
                         </span>
@@ -534,6 +534,8 @@ export default {
                 this.findObject(this.option.column, "type").hide = true
                 this.findObject(this.option.column, "businessType").hide = false
             }
+            this.amountSubSum=0
+            this.amountSubUsdSum=0
             // this.query = {};
             this.page.currentPage = 1
             this.selectionList = []

+ 29 - 36
src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -59,7 +59,8 @@
                                     </el-col>
                                     <el-col :span="12">
                                         <el-form-item label="收/付" prop="dc">
-                                            <el-select v-model="form.dc" placeholder="请选择" :disabled="editSave" size="small">
+                                            <el-select v-model="form.dc" placeholder="请选择" :disabled="editSave"
+                                                size="small">
                                                 <el-option v-for="item in options" :key="item.value" :label="item.label"
                                                     :value="item.value">
                                                 </el-option>
@@ -175,21 +176,6 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="开票CNY:" prop="amountCny">
-                                            <span>¥{{ form.amountCny }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="开票USD:" prop="amountUsd">
-                                            <span>${{ form.amountUsd }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="开票合计:" prop="amountLoc">
-                                            <span>¥{{ form.amountLoc }}</span>
-                                        </el-form-item>
-                                    </el-col>
                                 </el-row>
                             </div>
                         </el-col>
@@ -389,22 +375,29 @@
                             </div>
                         </el-col>
                     </el-row>
-                    <div style="display: flex;justify-content: flex-end;align-items: center;">
-                        <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="检索"
-                            true-label="追加">追加</el-checkbox>
-                        <el-button type="primary" size="small"
-                            :disabled="editSave || (tableData.length > 0 && appendType == '检索')" plain
-                            @click="finstlbillslistAccBillV1fun(appendType)">提取费用
-                        </el-button>
-                        <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
-                        </el-button>
-                        <el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm"
-                            @click="showForm = true">开展</el-button>
-                        <el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm"
-                            @click="showForm = false">收缩</el-button>
+                    <div style="display: flex;justify-content:space-between;align-items: center;">
+                        <div style="width: 40%;display: flex;justify-content:space-between;">
+                            <span>开票CNY:¥{{ form.amountCny ? form.amountCny : '0.00' }}</span>
+                            <span>开票USD:${{ form.amountUsd ? form.amountUsd : '0.00' }}</span>
+                            <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"
+                                :disabled="editSave" v-model="form.isExchangeToCny">转换成人民币
+                            </el-checkbox>
+                            <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索"
+                                true-label="追加">追加</el-checkbox>
+                            <el-button type="primary" size="small"
+                                :disabled="editSave || (tableData.length > 0 && appendType == '检索')" plain
+                                @click="finstlbillslistAccBillV1fun(appendType)">提取费用
+                            </el-button>
+                            <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
+                            </el-button>
+                            <el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm"
+                                @click="showForm = true">开展</el-button>
+                            <el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm"
+                                @click="showForm = false">收缩</el-button>
+                        </div>
                     </div>
                 </trade-card>
                 <el-card style="margin-top: 10px">
@@ -510,7 +503,7 @@ import {
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { getCurrentDate } from "@/util/date";
 import dicSelect from "@/components/dicSelect/main";
-import {getMonthDate,getYearDate} from "@/util/date";
+import { getMonthDate, getYearDate } from "@/util/date";
 import { bcurexrateList } from "@/api/iosBasicData/rateManagement";
 export default {
     components: { SearchQuery, fininvoicesitems, fininvoiceitemdetail, dicSelect },
@@ -538,7 +531,7 @@ export default {
             pageLoading: false, // 全屏加载
             saveLoading: false, // 按钮加载
             form: {
-                dc:'C',
+                dc: 'C',
                 invCurCode: 'CNY',
                 isRp: 1,
                 invType: '全电发票',
@@ -617,7 +610,7 @@ export default {
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
         if (!this.form.id) {
-            bcurexrateList({ current: 1, size: 35,type:'月汇率',code:'USD',exrateYear:getYearDate() }).then(res => {
+            bcurexrateList({ current: 1, size: 35, type: '月汇率', code: 'USD', exrateYear: getYearDate() }).then(res => {
                 for (let item of res.data.data.records) {
                     if (item.exrateMonth == getMonthDate()) {
                         this.$set(this.form, 'exrate', item.exratePayment)
@@ -1098,7 +1091,7 @@ export default {
             obj.curCode = this.form.curCode // 币种
             obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(',') : '' // 业务类型
             obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
-            obj.dc=this.form.dc
+            obj.dc = this.form.dc
             // 判断是否有对账单号
             if (this.form.checkNo) {
                 obj.corpId = this.form.corpId // 结算单位

+ 26 - 33
src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -74,7 +74,8 @@
                                     </el-col>
                                     <el-col :span="12">
                                         <el-form-item label="收/付" prop="dc">
-                                            <el-select v-model="form.dc" placeholder="请选择" :disabled="editSave" size="small">
+                                            <el-select v-model="form.dc" placeholder="请选择" :disabled="editSave"
+                                                size="small">
                                                 <el-option v-for="item in options" :key="item.value" :label="item.label"
                                                     :value="item.value">
                                                 </el-option>
@@ -190,21 +191,6 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="开票CNY:" prop="amountCny">
-                                            <span>¥{{ form.amountCny }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="开票USD:" prop="amountUsd">
-                                            <span>${{ form.amountUsd }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="开票合计:" prop="amountLoc">
-                                            <span>¥{{ form.amountLoc }}</span>
-                                        </el-form-item>
-                                    </el-col>
                                 </el-row>
                             </div>
                         </el-col>
@@ -386,22 +372,29 @@
                             </div>
                         </el-col>
                     </el-row>
-                    <div style="display: flex;justify-content: flex-end;align-items: center;">
-                        <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="检索"
-                            true-label="追加">追加</el-checkbox>
-                        <el-button type="primary" size="small"
-                            :disabled="statusType || (tableData.length > 0 && appendType == '检索')" plain
-                            @click="finstlbillslistAccBillV1fun(appendType)">提取费用
-                        </el-button>
-                        <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
-                        </el-button>
-                        <el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm"
-                            @click="showForm = true">开展</el-button>
-                        <el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm"
-                            @click="showForm = false">收缩</el-button>
+                    <div style="display: flex;justify-content:space-between;align-items: center;">
+                        <div style="width: 40%;display: flex;justify-content:space-between;">
+                            <span>开票CNY:¥{{ form.amountCny ? form.amountCny : '0.00' }}</span>
+                            <span>开票USD:${{ form.amountUsd ? form.amountUsd : '0.00' }}</span>
+                            <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"
+                                :disabled="editSave" v-model="form.isExchangeToCny">转换成人民币
+                            </el-checkbox>
+                            <el-checkbox v-model="appendType" :disabled="statusType" false-label="检索"
+                                true-label="追加">追加</el-checkbox>
+                            <el-button type="primary" size="small"
+                                :disabled="statusType || (tableData.length > 0 && appendType == '检索')" plain
+                                @click="finstlbillslistAccBillV1fun(appendType)">提取费用
+                            </el-button>
+                            <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
+                            </el-button>
+                            <el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm"
+                                @click="showForm = true">开展</el-button>
+                            <el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm"
+                                @click="showForm = false">收缩</el-button>
+                        </div>
                     </div>
                 </trade-card>
                 <el-card style="margin-top: 10px">
@@ -602,7 +595,7 @@ export default {
             pageLoading: false, // 全屏加载
             saveLoading: false, // 按钮加载
             form: {
-                dc:null,
+                dc: null,
                 invCurCode: 'CNY',
                 isRp: 1,
                 invType: '全电发票',

+ 27 - 34
src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -59,7 +59,8 @@
                                     </el-col>
                                     <el-col :span="12">
                                         <el-form-item label="收/付" prop="dc">
-                                            <el-select v-model="form.dc" placeholder="请选择" :disabled="editSave" size="small">
+                                            <el-select v-model="form.dc" placeholder="请选择" :disabled="editSave"
+                                                size="small">
                                                 <el-option v-for="item in options" :key="item.value" :label="item.label"
                                                     :value="item.value">
                                                 </el-option>
@@ -175,21 +176,6 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="开票CNY:" prop="amountCny">
-                                            <span>¥{{ form.amountCny }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="开票USD:" prop="amountUsd">
-                                            <span>${{ form.amountUsd }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="开票合计:" prop="amountLoc">
-                                            <span>¥{{ form.amountLoc }}</span>
-                                        </el-form-item>
-                                    </el-col>
                                 </el-row>
                             </div>
                         </el-col>
@@ -389,22 +375,29 @@
                             </div>
                         </el-col>
                     </el-row>
-                    <div style="display: flex;justify-content: flex-end;align-items: center;">
-                        <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="检索"
-                            true-label="追加">追加</el-checkbox>
-                        <el-button type="primary" size="small"
-                            :disabled="editSave || (tableData.length > 0 && appendType == '检索')" plain
-                            @click="finstlbillslistAccBillV1fun(appendType)">提取费用
-                        </el-button>
-                        <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
-                        </el-button>
-                        <el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm"
-                            @click="showForm = true">开展</el-button>
-                        <el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm"
-                            @click="showForm = false">收缩</el-button>
+                    <div style="display: flex;justify-content:space-between;align-items: center;">
+                        <div style="width: 40%;display: flex;justify-content:space-between;">
+                            <span>开票CNY:¥{{ form.amountCny ? form.amountCny : '0.00' }}</span>
+                            <span>开票USD:${{ form.amountUsd ? form.amountUsd : '0.00' }}</span>
+                            <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"
+                                :disabled="editSave" v-model="form.isExchangeToCny">转换成人民币
+                            </el-checkbox>
+                            <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索"
+                                true-label="追加">追加</el-checkbox>
+                            <el-button type="primary" size="small"
+                                :disabled="editSave || (tableData.length > 0 && appendType == '检索')" plain
+                                @click="finstlbillslistAccBillV1fun(appendType)">提取费用
+                            </el-button>
+                            <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
+                            </el-button>
+                            <el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm"
+                                @click="showForm = true">开展</el-button>
+                            <el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm"
+                                @click="showForm = false">收缩</el-button>
+                        </div>
                     </div>
                 </trade-card>
                 <el-card style="margin-top: 10px">
@@ -577,7 +570,7 @@ export default {
             pageLoading: false, // 全屏加载
             saveLoading: false, // 按钮加载
             form: {
-                dc:'D',
+                dc: 'D',
                 invCurCode: 'CNY',
                 isRp: 1,
                 invType: '全电发票',
@@ -1192,7 +1185,7 @@ export default {
             obj.curCode = this.form.curCode // 币种
             obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(',') : '' // 业务类型
             obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
-            obj.dc=this.form.dc
+            obj.dc = this.form.dc
             // 判断是否有对账单号
             if (this.form.checkNo) {
                 obj.corpId = this.form.corpId // 结算单位

+ 3 - 0
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -712,6 +712,9 @@ export default {
         if (this.$route.query.srcId) {
             this.refresh(this.$route.query.srcId)
         }
+        if (this.$route.query.id) {
+            this.refresh(this.$route.query.id)
+        }
         this.$store.commit("DOMIO_IN_DETAIL");
         isProcurement({ "param": "number.decimal" }).then(res => {
             this.numberDecimal = res.data.data ? Number(res.data.data) : 0

+ 6 - 6
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -375,12 +375,6 @@ export default {
       this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
-    if (this.$route.query.id) {
-      this.detailData = {
-        id: this.$route.query.id
-      };
-      this.detailsOpen = true;
-    }
     // this.corpsDescListAllfun()
   },
   activated() {
@@ -389,6 +383,12 @@ export default {
         this.$store.commit("DOMIO_IN_DETAIL");
         this.detailsOpen = true;
       }
+      if (this.$route.query.id) {
+        this.detailData = {
+          id: this.$route.query.id
+        };
+        this.detailsOpen = true;
+      }
     }, 100);
   },
   mounted() {

+ 1 - 1
vue.config.js

@@ -50,7 +50,7 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.8.106:1080',
+        // target: 'http://192.168.8.104:1080',
         // target: 'http://127.0.0.1:1080',
         // 打包地址
         target: 'http://121.37.83.47:10004',//服务器ip