Merge branch 'dev' of http://git.echepei.com/tire-platform/Smart_platform_ui into dev

src/api/iosBasicData/finvouchers.js

@@ -65,3 +65,13 @@ export const finvouchersitemsRemove = (ids) => {
     }
   })
 }
+// 获取核销记录
+export const getOffVoucherItems = (item) => {
+  return request({
+    url: '/api/blade-los/finvouchers/getOffVoucherItems',
+    method: 'post',
+    data: item
+  })
+}
+
+

src/views/approveDataH/check.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
 <!--    <avue-form class="trading-form" :option="option" ref="form" v-model="form"> </avue-form>-->
-    <div class="dialogButton" style="padding: 4px;">
-      <el-button size="small" :loading="buttonLoading" @click="$emit('gotoRecord', false)">上一笔</el-button>
-      <el-button size="small" :loading="buttonLoading" @click="$emit('gotoRecord', true)">下一笔</el-button>
+    <div class="dialogButton" :style="{padding: batch ? '16px' : '4px'}">
+      <el-button v-if="!batch" size="small" :loading="buttonLoading" @click="$emit('gotoRecord', false)">上一笔</el-button>
+      <el-button v-if="!batch" size="small" :loading="buttonLoading" @click="$emit('gotoRecord', true)">下一笔</el-button>
 
-      <el-button size="small" :loading="buttonLoading" @click="$emit('choceCheckFun', false)">关闭</el-button>
+      <el-button v-if="!batch" size="small" :loading="buttonLoading" @click="$emit('choceCheckFun', false)">关闭</el-button>
       <el-button type="primary" :loading="buttonLoading" size="small" @click="approved(1)">审批通过</el-button>
       <el-button type="warning" :loading="buttonLoading" size="small" @click="submit(2)">审批驳回</el-button>
 
@@ -18,6 +18,8 @@
         placeholder="审批意见"
       >
       </el-input>
+
+      <el-button v-if="batch" size="small" :loading="buttonLoading" @click="$emit('choceCheckFun', false)">关闭</el-button>
     </div>
     <mail-component ref="mail" @choceCheckFun="$emit('choceCheckFun', false)"></mail-component>
   </div>
@@ -33,6 +35,10 @@ export default {
   },
   name: "check",
   props: {
+    batch:{
+      type: Boolean,
+      deburred: true,
+    },
     checkData: {
       type: Object
     },
@@ -141,6 +147,12 @@ export default {
       //   cancelButtonText: "取消",
       //   type: "warning",
       // }).then(() => {
+      let cacheRow = this.checkData
+      // console.log('cacheRow', cacheRow);
+      // this.$emit("choceCheckFun", false, cacheRow);
+      //
+      // return
+
       this.checkData.operate = operate;
       if (this.idList.length !== 0) {
         //批量
@@ -178,7 +190,7 @@ export default {
                       .then(res => {
                         if (res.data.success) {
                           this.$message.success("操作成功!");
-                          this.$emit("choceCheckFun", true);
+                          this.$emit("choceCheckFun", false, cacheRow);
                         }
                         if (!this.checkDetail) {
                           //关闭付费申请页面
@@ -210,7 +222,7 @@ export default {
             .then(res => {
               if (res.data.success) {
                 this.$message.success("操作成功!");
-                this.$emit("choceCheckFun", true);
+                this.$emit("choceCheckFun", false, cacheRow);
               }
               if (!this.checkDetail) {
                 //关闭付费申请页面

src/views/approveDataH/index.vue

@@ -163,16 +163,20 @@
     <!--单个审批-->
     <el-dialog
       append-to-body
-      title="审批"
+      title="批量审批"
       class="el-dialogDeep"
       :visible.sync="checkDialog"
-      width="50%"
+      width="500px"
       :close-on-click-modal="false"
       :destroy-on-close="true"
       :close-on-press-escape="false"
       v-dialog-drag
     >
+      <div style="padding: 16px;">
+        <span>共选择批量审核单据 {{idList.length}} 张！</span>
+      </div>
       <check
+        :batch = "true"
         :checkData="checkData"
         :checkDetail="true"
         :idList="idList"
@@ -448,7 +452,7 @@ export default {
       getreportsList(1, 10, obj).then((res) => {
         this.reportRadio(res.data.data.records[0]);
         if (!this.selectionList.includes(row)) {
-          this.$refs.crud.toggleRowSelection(row);
+          this.$refs.crud.toggleRowSelection(row, true);
         }
       });
     },
@@ -640,17 +644,33 @@ export default {
         this.checkData = row;
       }
     },
-    choceCheckFun(reload) {
+    choceCheckFun(reload, removeRow) {
       // this.checkDialog = false;
       this.$refs.reportContainer.visible = false;
       if (reload === true) {
         this.refreshChange();
+      }else if(removeRow){
+        let selList = this.selectionList.filter(item => item != removeRow)
+        let i1 = this.dataList.indexOf(removeRow);
+        if(i1>=0) this.dataList.splice(i1, 1)
+        this.$nextTick(()=>{
+          selList.forEach(item => {
+            console.log(item.id, this.dataList.indexOf(item));
+            this.$refs.crud.toggleRowSelection(item, true);
+          })
+        })
       }
     },
-    choceCheckFFSQ(reload) {
+    choceCheckFFSQ(reload, removeRow) {
       this.checkDialog = false;
       if (reload === true) {
         this.refreshChange();
+      }else if(removeRow){
+        let i1 = this.dataList.indexOf(removeRow);
+        let i2 = this.selectionList.indexOf(removeRow);
+        console.log("choceCheckFFSQ", i1, i2);
+        if(i2>=0) this.selectionList.splice(i2, 1)
+        if(i1>=0) this.dataList.splice(i1, 1)
       }
     },
     openCheckSchedule(row) {

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -750,7 +750,7 @@ export default {
       this.voucher = res.data.data;
     });
     isProcurement({ param: "whether.open" }).then(res => {
-      // res.data.data === '1'
+      res.data.data = '1'
       this.whetheropen = res.data.data;
     });
     isProcurement({ param: "whether.auditing" }).then(res => {

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

@@ -3004,6 +3004,7 @@ export default {
         // console.log(value, name, row);
         // 计量单位
         this.$set(row, name, value);
+        console.log("this.unitNoData", this.unitNoData, "value", value);
         for (let item of this.unitNoData) {
           if (item.code == value) {
             // 按箱型
@@ -3441,13 +3442,14 @@ export default {
         //     }
         // }
         feeunitNodata = this.unitNoData.filter(u => u.quantityRule == units.quantityRule);
-        // OF 改运费 1722822288795000833
+        // OF 海运费 1722822288795000833
         let unitNo = feeunitNodata.length > 0 ? feeunitNodata[0].code : "JOB";
         if (feeRow && feeRow.code === "OF") {
           let accDeptId = this.assemblyForm.accDept + "";
           // 海运费：市场部 1753232111692791810 默认按箱型箱量计算；海运部 1717838531146289153 默认按票
           if (accDeptId == "1753232111692791810") {
-            unitNo = "CNTRTYPE";
+            // unitNo = "CNTRTYPE";
+            unitNo = arr.length>0 ? arr[0].code : "JOB";
           }
           if (accDeptId == "1717838531146289153") {
             unitNo = "JOB";

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

@@ -363,7 +363,7 @@
     </el-dialog>
 
 <!--    批量更改-->
-    <update-batch-field ref="updateFieldRef"></update-batch-field>
+    <update-batch-field ref="updateFieldRef" @refreshData="refreshData"></update-batch-field>
 
     <!--导入模板-->
     <!-- <el-dialog title="导入 Magic Hand 文件" append-to-body :visible.sync="magicHandBox" width="555px"
@@ -582,8 +582,9 @@ export default {
         expand: true,
         expandRowKeys: [],
         rowKey: "id",
-        height: 500,
-        calcHeight: 30,
+        // height: 500,
+        height: "auto",
+        calcHeight: 6,
         tip: false,
         searchShow: true,
         searchMenuSpan: 12,
@@ -2952,10 +2953,13 @@ export default {
   text-align: center;
 }
 
-/deep/ .el-col-md-8 {
-  width: 24.33333%;
+::v-deep .el-table__row {
+  height: 24px;
 }
 
+::v-deep.el-col-md-8 {
+  width: 24.33333%;
+}
 ::v-deep.el-form-item {
   margin-bottom: 0;
 }

src/views/iosBasicData/accounts/assembly/accountsDialog.vue

@@ -81,7 +81,8 @@
                         <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isEmpl">职员</el-checkbox>
                         <!--<el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isStock">库存</el-checkbox>-->
                         <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isManual" style="margin-left: 50px;">允许手工凭证使用</el-checkbox>
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isArAp">应收/应付科目</el-checkbox>
+                        <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isDc">应收/应付科目</el-checkbox>
+                      <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isArAp">预收/预付科目</el-checkbox>
                     </el-form-item>
                 </el-col>
 

src/views/iosBasicData/accounts/index.vue

@@ -346,6 +346,24 @@ import {
             },
             {
               label: "应收/应付科目",
+              prop: "isDc",
+              overHidden: true,
+              search: true,
+              type:'select',
+              width: 120,
+              dicData:[
+                {
+                  label:'否',
+                  value:'0',
+                },
+                {
+                  label:'是',
+                  value:'1',
+                }
+              ]
+            },
+            {
+              label: "预收/预付科目",
               prop: "isArAp",
               overHidden: true,
               search: true,
@@ -831,7 +849,7 @@ import {
     cursor:pointer;
     color: #1e9fff;
 }
-/deep/ .el-col-md-8 {
+::v-deep .el-col-md-8 {
     width: 24.33333%;
 }
 </style>

src/views/iosBasicData/finvouchers/assembly/fromtableDetails.vue

@@ -18,9 +18,10 @@
       <el-table-column type="index" width="40" style="text-align: center"> </el-table-column>
       <el-table-column prop="descr" label="摘要" width="auto" style="padding: 0">
         <template slot-scope="{ row }">
+<!--          type="textarea"-->
           <el-input
             style="width: 100%"
-            type="textarea"
+            type="text"
             v-model="row.descr"
             size="small"
             autocomplete="off"
@@ -31,9 +32,11 @@
           </el-input>
         </template>
       </el-table-column>
-      <el-table-column prop="accountCode" label="科目代码" width="400px">
+      <el-table-column prop="accountCode" label="科目代码" width="360px">
         <template slot-scope="{ row }">
-          <div style="display: flex; align-items: center; justify-content: space-between">
+          <div
+            style="display: flex; align-items: center; justify-content: space-between"
+          >
             <search-query
               style="width: 100%"
               :datalist="accountData"
@@ -50,9 +53,12 @@
               @corpChange="corpChange($event, 'accountId', row)"
             >
             </search-query>
-            <el-tooltip v-if="!disabled" class="item" effect="dark" content="修改" placement="top">
+            <el-tooltip v-if="!disabled &&(row.isEmpl===1 || row.isCorp === 1 || row.isDept === 1 || row.isItem === 1)" class="item" effect="dark" content="核算项目" placement="top">
               <el-button size="mini" type="primary" icon="el-icon-edit" circle @click="auxiliaryAccountingfun(row)" :disabled="disabled"></el-button>
             </el-tooltip>
+            <el-tooltip v-if="!disabled && row.isDc === 1" class="item" effect="dark" content="预收/预付核销" placement="top">
+              <el-button size="mini" type="primary" icon="el-icon-scissors" circle @click="showOffRecordsfun(row)" :disabled="disabled"></el-button>
+            </el-tooltip>
           </div>
           <div style="display: flex">
             <!--            _【职员】  _【部门】  _【客户】-->
@@ -60,7 +66,8 @@
               (row.accountCnName ? row.accountCnName : "　") +
               (row.isEmpl === 1 && row.emplName ? "/" + row.emplName : "") +
               (row.isDept === 1 && row.deptName ? "/" + row.deptName : "") +
-              (row.isCorp === 1 && row.corpShortName ? "/" + row.corpShortName : "")
+              (row.isCorp === 1 && row.corpShortName ? "/" + row.corpShortName : "") +
+              (row.isItem === 1 ? "/" + row.itemClassify + "-" + (row.itemName ? row.itemName : "") : "")
             }}</span>
           </div>
         </template>
@@ -68,15 +75,7 @@
 
       <el-table-column prop="dc" label="方向" width="60px" style="padding: 0">
         <template slot-scope="{ row }">
-          <el-input
-            style="width: 100%; text-align: center"
-            v-text="row.dc == 'D' ? '借' : '贷'"
-            size="small"
-            autocomplete="off"
-            clearable
-            :disabled="true"
-          >
-          </el-input>
+          <span>{{ row.dc == 'D' ? '借' : '贷' }}</span>
         </template>
       </el-table-column>
 
@@ -121,7 +120,7 @@
         <el-table-column prop="exrate" label="汇率" width="100px">
           <template slot-scope="{ row }">
             <el-input-number
-              v-if="row.curCode == 'USD'"
+              v-if="row.curCode === 'USD'"
               style="width: 100%"
               v-model="row.exrate"
               size="small"
@@ -141,11 +140,12 @@
         <el-table-column prop="amountDrUsd" label="借方" width="120px">
           <template slot-scope="{ row }">
             <el-input-number
+              v-if="row.changeMode !== 'd'"
               style="width: 100%; text-align: right"
               v-model="row.amountDrUsd"
               size="small"
               autocomplete="off"
-              :disabled="row.curCode == 'CNY' || !row.accountId || disabled"
+              :disabled="row.curCode === 'CNY' || !row.accountId || disabled"
               clearable
               placeholder="请输入借方"
               :precision="2"
@@ -158,11 +158,12 @@
         <el-table-column prop="amountCrUsd" label="货方" width="120px">
           <template slot-scope="{ row }">
             <el-input-number
+              v-if="row.changeMode !== 'd'"
               style="width: 100%"
               v-model="row.amountCrUsd"
               size="small"
               autocomplete="off"
-              :disabled="row.curCode == 'CNY' || !row.accountId || disabled"
+              :disabled="row.curCode === 'CNY' || !row.accountId || disabled"
               clearable
               placeholder="请输入货方"
               :precision="2"
@@ -202,7 +203,7 @@
               :disabled="disabled"
             ></el-button>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" content="删除" placement="top">
+          <el-tooltip class="item" effect="dark" :content="scope.row.changeMode === 'd' ? '恢复' : '删除'" placement="top">
             <el-button
               size="mini"
               type="danger"
@@ -267,7 +268,7 @@ export default {
           sums[index] = "合计";
           return;
         }
-        const values = data.map((item) => Number(item[column.property]));
+        const values = data.map((item) => item.changeMode === 'd' ? 0.00 : Number(item[column.property]));
         // 显示列的统计 金额
         let arr = ["amountDr", "amountCr", "amountDrUsd", "amountCrUsd"];
         // 判断是否有这个数据
@@ -282,7 +283,7 @@ export default {
               }
             }, 0);
             sums[index] = sums[index].toFixed(2); // 把合计的参数保留两位小数
-            sums[index] += " 元";
+            // sums[index] += " 元";
           } else {
             sums[index] = " ";
           }
@@ -337,7 +338,7 @@ export default {
       //     this.$set(row,'amountDrUsd',0)
       // }
       if (row.curCode == "USD") {
-        this.$set(row, "exrate", row.exrate ? Number(row.exrate) : 0);
+        this.$set(row, "exrate", row.exrate ? Number(row.exrate) : 1);
         this.$set(row, "amountCr", row.amountCr ? Number(row.amountCr) : 0);
         this.$set(row, "amountDr", row.amountDr ? Number(row.amountDr) : 0);
 
@@ -354,9 +355,9 @@ export default {
       if (name == "Cusd") {
         this.$set(row, "amountDrUsd", 0);
       }
-      this.$set(row, "exrate", row.exrate ? Number(row.exrate) : 0);
-      this.$set(row, "amountCr", row.amountCrUsd ? Number(row.amountCrUsd) : 0);
-      this.$set(row, "amountDr", row.amountDrUsd ? Number(row.amountDrUsd) : 0);
+      this.$set(row, "exrate", row.exrate ? Number(row.exrate) : 1);
+      this.$set(row, "amountCrUsd", row.amountCrUsd ? Number(row.amountCrUsd) : 0);
+      this.$set(row, "amountDrUsd", row.amountDrUsd ? Number(row.amountDrUsd) : 0);
 
       this.$set(row, "amountCr", (row.amountCrUsd * row.exrate).toFixed(2));
       this.$set(row, "amountDr", (row.amountDrUsd * row.exrate).toFixed(2));
@@ -384,6 +385,12 @@ export default {
       }
       this.$emit("auxiliaryAccountingfun", row);
     },
+    showOffRecordsfun (row){
+      if (!row.accountId) {
+        return this.$message.warning("请先选择科目代码");
+      }
+      this.$emit("showOffRecordsfun", row);
+    },
     // 下拉回调
     corpChange(value, name, row) {
       let found = false;
@@ -415,6 +422,9 @@ export default {
             this.$set(row, "isItem", item.isItem);
             this.$set(row, "itemClassifyId", item.itemClassifyId);
             this.$set(row, "itemClassify", item.itemClassify);
+
+            this.$set(row, "isDc", item.isDc);
+            this.$set(row, "isArAp", item.isArAp);
             // 打开弹窗
             this.$emit("auxiliaryAccountingfun", row);
           }
@@ -444,6 +454,9 @@ export default {
           this.$set(row, "itemClassifyId", 0);
           this.$set(row, "itemClassify", "");
 
+          this.$set(row, "isDc", 0);
+          this.$set(row, "isArAp", 0);
+
           this.$set(row, "exrate", 0);
         }
 

src/views/iosBasicData/finvouchers/index.vue

@@ -74,6 +74,7 @@ export default {
         currentPage: 1,
         total: 0
       },
+      voucherTypeData: [],
       selectionList: [],
       option: {},
       optionBack: {
@@ -82,6 +83,7 @@ export default {
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
+        searchSpan: 6,
         border: true,
         index: true,
         viewBtn: true,
@@ -89,27 +91,40 @@ export default {
         dialogClickModal: false,
         menuWidth: '100',
         searchIcon: true,
-        searchIndex: 3,
+        searchIndex: 4,
         column: [
           {
             label: "单据编号",
             prop: "billNo",
             search: true,
+            searchOrder: 5,
             overHidden: true,
             width: 120,
           },
           {
             label: "类型",
-            prop: "voucherTypeName",
+            prop: "voucherType",
             overHidden: true,
-            width: 60,
+            width: 80,
+
+            type: "select",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
+            dicData: [],
+            search: true,
+            searchOrder: 1,
+            sortable: true
           },
           {
             label: "凭证号",
             prop: "voucherNo",
             search: true,
+            searchOrder: 2,
             overHidden: true,
-            width: 80,
+            width: 100,
+            sortable: true
           },
           {
             label: "凭证日期",
@@ -121,6 +136,7 @@ export default {
             label: "凭证开始日期",
             prop: "voucherDateStart",
             search: true,
+            searchOrder: 3,
             overHidden: true,
             searchLabelWidth: "100",
             hide: true,
@@ -133,6 +149,7 @@ export default {
             label: "凭证结束日期",
             prop: "voucherDateEnd",
             search: true,
+            searchOrder: 4,
             overHidden: true,
             searchLabelWidth: "100",
             hide: true,
@@ -141,6 +158,7 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             width: 100,
           },
+          /*
           {
             label: "年",
             prop: "accountYear",
@@ -153,11 +171,14 @@ export default {
             overHidden: true,
             width: 40,
           },
+          */
           {
             label: "摘要",
             prop: "descr",
             overHidden: true,
             width: 200,
+            search: true,
+            searchOrder: 6,
           },
           {
             label: "借方金额(CNY)",
@@ -172,6 +193,15 @@ export default {
             width: 120,
           },
           {
+            label: "CNY金额",
+            prop: "amountDr",
+            overHidden: true,
+            width: 120,
+            hide: true,
+            search: true,
+            searchOrder: 7,
+          },
+          {
             label: "借方金额(USD)",
             prop: "amountDrUsd",
             overHidden: true,
@@ -184,9 +214,19 @@ export default {
             width: 120,
           },
           {
+            label: "USD金额",
+            prop: "amountDrUsd",
+            overHidden: true,
+            width: 120,
+            hide: true,
+            search: true,
+            searchOrder: 8,
+          },
+          {
             label: "外币",
             prop: "isForeign",
             search: true,
+            searchOrder: 9,
             type: 'select',
             dicData: [],
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=ifInvoice",
@@ -197,6 +237,7 @@ export default {
             overHidden: true,
             width: 60,
           },
+          /*
           {
             label: "数量",
             prop: "isQuantity",
@@ -211,10 +252,12 @@ export default {
             overHidden: true,
             width: 60,
           },
+           */
           {
             label: "凭证来源",
             prop: "voucherSource",
             search: true,
+            searchOrder: 10,
             type: 'select',
             dicData: [],
             // dicUrl: "/api/blade-system/dict-biz/dictionary?code=voucher_source_los",
@@ -226,6 +269,14 @@ export default {
             width: 100,
           },
           {
+            label: "来源单号",
+            prop: "srcBlllNo",
+            overHidden: true,
+            width: 140,
+            search: true,
+            searchOrder: 12,
+          },
+          {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,
@@ -264,7 +315,6 @@ export default {
           {
             label: "状态",
             prop: "voucherStatus",
-            search: true,
             type: 'select',
             dicData: [],
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=voucher_status_los",
@@ -323,23 +373,31 @@ export default {
       this.datekey = Date.now()
     },
     // 获取字典数据
+    setColumnDictData(name, data) {
+      let col = this.findObject(this.option.column, name);
+      if(col && typeof col === "object") col.dicData = Array.isArray(data) ? data : [];
+    },
     voucherStatusWorkDictsfun() {
       getWorkDicts("voucher_status_los").then(res => {
-        this.findObject(this.option.column, "voucherStatus").dicData = res.data.data;
+        this.setColumnDictData("voucherStatus", res.data.data);
       })
       // 是否字典
       getWorkDicts("ifInvoice").then(res => {
-        this.findObject(this.option.column, "isForeign").dicData = res.data.data;
-        this.findObject(this.option.column, "isQuantity").dicData = res.data.data;
+        this.setColumnDictData("isForeign", res.data.data);
+        this.setColumnDictData("isQuantity", res.data.data);
       })
 
       bbusinesstypeList(1,100,{enableVoucher:'1'}).then(res => {
         let data=[{id: 0, code: "MANUAL", cnName: "手工凭证"}].concat(res.data.data.records)
-        this.findObject(this.option.column, "voucherSource").dicData = data;
+        this.setColumnDictData("voucherSource", data);
       })
       // getWorkDicts("voucher_source_los").then(res => {
       //   this.findObject(this.option.column, "voucherSource").dicData = res.data.data;
       // })
+      getWorkDicts("voucher_word_los").then((res) => {
+        this.voucherTypeData = res.data.data;
+        this.setColumnDictData("voucherType", res.data.data);
+      });
     },
 
     // 凭证记账
@@ -512,7 +570,9 @@ export default {
       done();
     },
     searchReset() {
-      this.query = {};
+      this.query = {
+        voucherStatus: "0",
+      };
       this.onLoad(this.page);
     },
     searchChange(params, done) {
@@ -582,6 +642,8 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
+
+        this.voucherStatusWorkDictsfun()
       }
     },
     // 更改表格颜色