Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/components/fee-info/config/feeInfo.json

@@ -13,6 +13,11 @@
   "menuWidth": 130,
   "align":"center",
   "showSummary": true,
+  "lazy": true,
+  "simplePage": true,
+  "dialogWidth": "60%",
+  "tree": true,
+  "dialogClickModal": false,
   "column": [
     {
       "label": "结算单位",

src/components/fee-info/main.vue

@@ -33,13 +33,13 @@
             :disabled="disabled || selectionList.length == 0"
             v-if="selectTab === 1"
           >生成账单</el-button>
-          <el-button
+    <!--      <el-button
             type="info"
             size="small"
             @click.stop="rowAdd"
             :disabled="disabled || selectionList.length == 0"
             v-if="selectTab === 1"
-          >查看生成记录</el-button>
+          >查看生成记录</el-button>-->
           <el-button
             type="warning"
             size="small"
@@ -47,13 +47,13 @@
             :disabled="disabled || selectionList.length == 0"
             v-if="selectTab === 2"
           >申请货款</el-button>
-          <el-button
+     <!--     <el-button
             type="info"
             size="small"
             @click.stop="rowAdd"
             :disabled="disabled || selectionList.length == 0"
             v-if="selectTab === 2"
-          >查看申请记录</el-button>
+          >查看申请记录</el-button>-->
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button
@@ -208,25 +208,6 @@
       </span>
     </el-dialog>
     <crop-dialog ref="cropDialog" @importCorp="importCorp"></crop-dialog>
-    <el-dialog
-      append-to-body
-      title="账单"
-      class="el-dialogDeep"
-      :visible.sync="applyPaymentDialog"
-      width="70%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false"
-      v-dialog-drag
-    >
-      <apply-payment
-        :billType="billType"
-        :billData="billData"
-        :arrList="arrList"
-        @choceFun="choceFun"
-      >
-      </apply-payment>
-    </el-dialog>
   </div>
 </template>
 
@@ -240,6 +221,7 @@ import { isPercentage, micrometerFormat } from "@/util/validate";
 import cropDialog from "@/components/crop-dialog/main";
 import _ from "lodash";
 import ApplyPayment from "../finance/applyPayment";
+import {applyLoan,paymentApply} from "@/api/financialManagement/paymentRequest";
 
 export default {
   name: "feeInfo",
@@ -287,9 +269,6 @@ export default {
       feeData: [],
       selectionList: [],
       reData: null,
-      billData:{
-        optionType:'JK'
-      },
       currencyList: [],
       breakConfiguration:{
         multipleChoices:false,
@@ -301,6 +280,7 @@ export default {
         placeholder:'请点击右边按钮选择',
         dicData:[]
       },
+      isUpdata:true,//是否需要触发监听
       allData:[],
       data_one:[],
       data_two:[],
@@ -308,9 +288,6 @@ export default {
       activeName:"first",
       tab1:true,
       tab2:false,
-      applyPaymentDialog:false,
-      billType:'',
-      arrList:[],
     };
   },
   props: {
@@ -322,6 +299,9 @@ export default {
     },
     feeUrl: {
       type: String
+    },
+    billUrl: {
+      type: String
     }
   },
   filters: {
@@ -364,8 +344,7 @@ export default {
 
         this.selectTab = 1
         this.feeData = this.data_one  //切换数据
-        this.selectionList = [];
-        this.arrList = [];
+        // this.selectionList = [];
 
       } else if(tab.name == "second") {
         this.tab1 = false;
@@ -375,8 +354,7 @@ export default {
         }
         this.selectTab = 2
         this.feeData = this.data_two
-        this.selectionList = [];
-        this.arrList = [];
+        // this.selectionList = [];
       }
     },
     cellStyle() {
@@ -440,7 +418,6 @@ export default {
       }
     },
     rateChange(row) {
-      row.exchangeRate;
       if (row.exchangeRate >= 100) {
         row.exchangeRate = 0;
         this.$message.error("汇率不能超过100%");
@@ -567,10 +544,17 @@ export default {
       //保存时  将所出的tab页数据赋值到相应 data上
       if(this.selectTab == 1){
         this.data_one = this.feeData
+        this.data_one.map(item =>{
+          delete item.$cellEdit
+          delete  item.$index
+        })
       }else{
         this.data_two = this.feeData
+        this.data_two.map(item =>{
+          delete item.$cellEdit
+          delete  item.$index
+        })
       }
-
       this.allData.push(...this.data_one,...this.data_two)
 
       return this.allData;
@@ -585,52 +569,54 @@ export default {
               return this.$message.error('批量操作结算单位必须一致')
             }
           }
-          this.billType = type
+          this.isUpdata = false
+          this.selectionList.map(item =>{
+            // item.url = this.billUrl
+            item.srcOrderno = params.srcOrderno
+            item.srcParentId = params.parentId
+            item.corpsName = item.corpName
+            item.srcFeesId = item.id
+            item.costType = item.itemId
+            item.itemType = '采购'
+            item.optionType = 'JK'
+            item.srcType = 2   //费用明细申请
+          })
+          let data = {
+            billType: type,
+            itemsList : this.selectionList
+          }
           if(type === '申请'){
-             this.selectionList.map(item =>{
-              delete item.id
-              item.corpsName = item.corpName
-              item.srcFeesId = item.id
-              item.costType = item.itemId
-              item.itemType = '采购'
-              item.optionType = 'JK'
-              item.srcType = 2   //费用明细申请
-              let form = {
-                form:{
-                  ...item,
+            this.$confirm("您确定申请货款吗？", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(()=>{
+              applyLoan(data).then(res=>{
+                if(res.data.success){
+                  this.$message.success("操作成功!")
                 }
-              }
-              this.arrList.push(form)
+              })
+            }).finally(()=>{
+              this.isUpdata = true
             })
           }else{
-            this.selectionList.map(item =>{
-              delete item.id
-              item.corpsName = item.corpName
-              item.srcFeesId = item.id
-              item.costType = item.itemId
-              item.itemType = '采购'
-              item.optionType = 'JK'
-              item.srcType = 2   //费用明细申请
-              let form = {
-                form:{
-                  ...item,
+            this.$confirm("您确定生成账单吗？", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(()=>{
+              paymentApply(data).then(res=>{
+                if(res.data.success){
+                  this.$message.success("操作成功!")
                 }
-              }
-              this.arrList.push(form)
+              })
+            }).finally(()=>{
+              this.isUpdata = true
             })
           }
-          this.openApplyPayment()
         }
       })
     },
-    //打开账单
-    openApplyPayment(){
-      this.applyPaymentDialog = true;
-    },
-    //关闭账单
-    choceFun(){
-
-    },
     summaryMethod({ columns, data }) {
       const sums = [];
       if (columns.length > 0) {
@@ -671,16 +657,20 @@ export default {
   watch: {
     orderFeesList: function(rows) {
       this.allData = rows ? rows : [];
+      console.log(777)
       if(this.allData.length !=0){
         this.data_one=this.allData.filter(item=>item.feesType === 1)  //应收
         this.data_two=this.allData.filter(item=>item.feesType === 2)  //应付
-
-        if( this.feeData.length != 0){
-          this.feeData = this.data_one
+        console.log(this.isUpdata)
+        if(this.isUpdata){
+          if(this.selectTab == 1){
+            this.feeData = this.data_one
+          }else{
+            this.feeData = this.data_two
+          }
         }
-
       }
-    }
+    },
   }
 };
 </script>

src/components/finance/applyPayment.vue

@@ -83,8 +83,10 @@ export default {
     arrList: {
       type: Array,
       default: []
+    },
+    billUrl:{
+      type: String
     }
-
   },
   data() {
     return {
@@ -352,6 +354,7 @@ export default {
 
             const params = {
               billType : this.billType,
+              url:this.billUrl,
               DC : this.billData.itemType === "采购"?"C":"D",     //账单明细会根据D C区分采购 销售搜索
               itemsList: itemsList
             }
@@ -361,24 +364,25 @@ export default {
                 if(res.data.success){
                   this.$message.success("操作成功!")
                   this.$emit("choceFun");
-                  //跳转付款申请页面
-                  if(this.$store.getters.pqStatus){
-                    this.$alert("无法自动跳转到付款申请页面,因为页面已存在。", "温馨提示", {
-                      confirmButtonText: "确定",
-                      type: 'warning',
-                      callback: action => {
-                      }
-                    });
-                  }else{
-                    //关闭一下存在的列表页  跳转
-                    this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/paymentRequest');
-                    this.$router.push({
-                      path: "/financialManagement/paymentRequest/paymentRequest",
-                      query: {params: res.data.data.id},
-                    });
-                  }
                 }
               })
+              //跳转付款申请页面
+              //不在跳转
+              // if(this.$store.getters.pqStatus){
+              //   this.$alert("无法自动跳转到付款申请页面,因为页面已存在。", "温馨提示", {
+              //     confirmButtonText: "确定",
+              //     type: 'warning',
+              //     callback: action => {
+              //     }
+              //   });
+              // }else{
+              //   //关闭一下存在的列表页  跳转
+              //   this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/paymentRequest');
+              //   this.$router.push({
+              //     path: "/financialManagement/paymentRequest/paymentRequest",
+              //     query: {params: res.data.data.id},
+              //   });
+              // }
             }
             //采购退款结算 销售收款结算  不需申请请核 直接结算  => 结算
             if(this.billType === "收费"){

src/util/contrastData.js

@@ -27,6 +27,7 @@ export function contrastList(newlist, oldlist) {
         if (newitem == olditem) {
           if(!(newlist[i][newitem] instanceof Array)){
             if (newlist[i][newitem] != oldlist[i][olditem]) {
+              console.log(newitem,i,newlist[i][newitem],oldlist[i][olditem])
               return true
             }
           }

src/views/approveData/configuration/mainList.json

@@ -23,61 +23,89 @@
   "headerAlign": "center",
   "column": [
     {
-      "label": "供应商",
-      "prop": "corpsId",
-      "search": false,
-      "hide": true,
+      "label": "业务类型",
+      "prop": "processType",
+      "type": "select",
+      "dicData": [
+        {
+          "label": "付费审批",
+          "value": "付费审批"
+         },
+        {
+          "label": "销售订单",
+          "value": "销售订单"
+        },
+        {
+          "label": "采购订单",
+          "value": "采购订单"
+        },
+        {
+          "label": "付费申请",
+          "value": "付费申请"
+        }
+      ],
+      "search": true,
       "overHidden": true,
-      "width": 200
+      "width": 200,
+      "index": 1
     },
     {
-      "label": "供应商",
-      "prop": "corpsName",
+      "label": "审核状态",
+      "prop": "auditStatus",
+      "type": "select",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=auditStatus",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "search": true,
       "overHidden": true,
       "width": 200,
-      "index": 1
+      "index": 2
     },
     {
-      "label": "采购合同号",
-      "prop": "orderNo",
-      "search": false,
+      "label": "往来单位",
+      "prop": "corpsId",
+      "search": true,
+      "hide": true,
       "overHidden": true,
-      "width": 180,
-      "index": 2
+      "width": 200
     },
     {
-      "label": "订单日期",
-      "prop": "orderDate",
-      "type": "date",
-      "search": false,
-      "unlinkPanels": true,
-      "searchRange": true,
+      "label": "往来单位",
+      "prop": "corpsName",
       "overHidden": true,
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "width": 180,
+      "width": 200,
       "index": 3
     },
     {
-      "label": "金额",
-      "prop": "corpName",
+      "label": "业务编号",
+      "prop": "orderNo",
+      "search": true,
       "overHidden": true,
-      "width": 120,
+      "width": 180,
       "index": 4
     },
     {
       "label": "申请人",
       "prop": "sendName",
       "overHidden": true,
-      "index": 5,
+      "search": true,
+      "index": 6,
       "width": 150
     },
     {
       "label": "申请日期",
       "prop": "sendTime",
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "search": true,
       "overHidden": true,
-      "width": 180,
-      "index": 6
+      "index": 7,
+      "width":200
     }
   ]
 }

src/views/approveData/index.vue

@@ -20,11 +20,32 @@
           :configuration="configuration"
         ></select-component>
       </template>
+      <template slot="menuLeft">
+        <el-button size="small"
+                   type="success"
+                   :disabled="true"
+                   @click.stop=""
+        >批量审批
+        </el-button>
+        <el-button size="small"
+                   type="info"
+                   :disabled="true"
+                   @click.stop=""
+        >报表
+        </el-button>
+      </template>
       <template slot-scope="scope" slot="menu">
         <el-button
           type="text"
           size="small"
           :disabled="scope.row.operate"
+          @click.stop="jumpPage(scope.row)"
+        >查看
+        </el-button>
+        <el-button
+          type="text"
+          size="small"
+          :disabled="scope.row.operate"
           @click.stop="pass(scope.row, 1)"
         >审批通过
         </el-button>
@@ -81,6 +102,15 @@
       // option.height = window.innerHeight - 200 ;
     },
     methods: {
+      jumpPage(row){
+        if(row.url){
+            this.$router.$avueRouter.closeTag(row.url);
+            this.$router.push({
+              path: row.url,
+              query: {check : row},
+            });
+        }
+      },
       //审批通过
       pass(row,operate){
         row.operate =  operate

src/views/basicData/productInformation/detailsPageEdit.vue

@@ -274,6 +274,11 @@ export default {
             span: 8
           },
           {
+            label: "积分倍数",
+            prop: "a",
+            span: 8
+          },
+          {
             label: "备注",
             prop: "remarks",
             type: "textarea",

src/views/businessManagement/inventoryAccount/index.vue

@@ -121,10 +121,15 @@ export default {
       });
     },
     uploadAfter(res, done, loading, column) {
+      console.log(res)
       window.console.log(column);
       this.excelBox = false;
       this.page.currentPage = 1;
-      this.$message.warning(res)
+      if (res) {
+        this.$message.warning(res)
+      } else {
+        this.$message.success('导入成功')
+      }
       this.onLoad(this.page);
       loading()
       done();

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -13,32 +13,45 @@
           size="small"
           @click="detailData.seeDisabled = false"
           type="primary"
+          style="margin-right: 8px"
         >编辑</el-button>
-        <el-button type="primary"
-                   size="small"
-                   :disabled="true"
-                   @click.stop="">请核
-        </el-button>
-        <el-button
-          size="small"
-          class="el-button--small-yh"
-          :disabled="detailData.seeDisabled || !form.id"
-          type="warning"
-          @click="applyPayment('申请')"
-        >
-          申请货款
-        </el-button>
-        <el-button type="info"
-                   size="small"
-                   @click="openApplicationDialog"
-                   :disabled="!form.id"
-        >查看申请记录
-        </el-button>
-        <el-button type="warning"
-                   size="small"
-                   class="el-button--small-yh "
-                   @click.stop="applyPayment('收费')">退款
-        </el-button>
+        <el-dropdown style="margin-right: 8px;">
+          <el-button
+            type="primary"
+            size="small"
+          >
+            审核处理<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item :disabled="true">请核</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-dropdown style="margin-right: 8px;">
+          <el-button
+            type="warning"
+            size="small"
+          >
+            账单处理<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              :disabled="detailData.seeDisabled || !form.id"
+              @click="applyPayment('申请')"
+            >
+              申请货款
+            </el-dropdown-item>
+            <el-dropdown-item
+               @click="openApplicationDialog"
+               :disabled="!form.id"
+            >查看申请记录
+            </el-dropdown-item>
+            <el-dropdown-item
+               @click.stop="applyPayment('收费')"
+               :disabled="!this.form.id"
+            >退款
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
         <el-button
           size="small"
           class="el-button--small-yh"

src/views/businessManagement/salesOrder/configuration/commodity.json

@@ -6,14 +6,17 @@
   "addBtn": false,
   "searchShow": true,
   "searchShowBtn": false,
-  "menu": false,
+  "menu": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 80,
   "searchSpan": 8,
   "searchMenuSpan": 8,
   "searchMenuPosition": "right",
   "border": true,
   "index": true,
   "selection": true,
-  "viewBtn": true,
   "dialogClickModal": false,
   "column": [
     {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -13,40 +13,55 @@
           size="small"
           @click="detailData.seeDisabled = false"
           type="primary"
+          style="margin-right: 8px"
         >编辑</el-button>
-        <el-button type="primary"
-                   size="small"
-                   :disabled="true"
-                   @click.stop="">请核
-        </el-button>
-        <el-button
-          class="el-button--small-yh"
-          type="warning"
-          :disabled="detailData.seeDisabled"
-          size="small"
-          @click="applySettlement('收费')"
-        >生成账单</el-button>
-        <el-button
-          class="el-button--small-yh"
-          type="warning"
-          :disabled="detailData.seeDisabled"
-          size="small"
-          @click="applySettlement('申请')"
-        >退款</el-button>
-        <el-button
-          class="el-button--small-yh"
-          type="primary"
-          :disabled="detailData.seeDisabled"
-          size="small"
-          @click="saveSell"
-        >生成采购单</el-button>
-        <el-button
-          class="el-button--small-yh"
-          type="success" @click="copyOrder"
-          size="small"
-          :disabled="detailData.seeDisabled || !this.form.id">
-          复制新单
-        </el-button>
+        <el-dropdown style="margin-right: 8px;">
+          <el-button
+            type="primary"
+            size="small"
+          >
+            审核处理<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item :disabled="true">请核</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-dropdown style="margin-right: 8px;">
+          <el-button
+            type="warning"
+            size="small"
+          >
+            账单处理<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              :disabled="detailData.seeDisabled"
+              @click="applySettlement('收费')">生成账单
+            </el-dropdown-item>
+            <el-dropdown-item
+              :disabled="detailData.seeDisabled"
+              @click="applySettlement('申请')"
+            >退款</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-dropdown style="margin-right: 8px;">
+          <el-button
+            type="success"
+            size="small"
+          >
+            业务处理<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              :disabled="detailData.seeDisabled"
+              @click="saveSell">生成采购单
+            </el-dropdown-item>
+            <el-dropdown-item
+              :disabled="detailData.seeDisabled || !this.form.id"
+              @click="copyOrder"
+            >复制新单</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
         <el-button
           class="el-button--small-yh"
           type="primary"
@@ -468,13 +483,39 @@
           <basic-container>
             <avue-crud :option="optionTwo"
                        :table-loading="loading"
-                       :data="data"
+                       :data="goodsListShow"
                        ref="crud"
                        @refresh-change="refreshChange"
                        @selection-change="selectionChange"
                        @search-change="goodsSearch"
                        :page.sync="page"
-                       @on-load="onLoad"></avue-crud>
+                       @on-load="onLoad">
+              <template slot="menuLeft" slot-scope="{size}">
+                <el-tabs v-model="activeName" @tab-click="tabHandle">
+                  <el-tab-pane label="查询结果" name="searchList"></el-tab-pane>
+                  <el-tab-pane label="已选定数据" name="importStaging"></el-tab-pane>
+                </el-tabs>
+              </template>
+              <template slot-scope="scope" slot="menu">
+                <el-button
+                  type="text"
+                  icon="el-icon-edit"
+                  size="small"
+                  @click.stop="importStagList(scope.row,scope.index)"
+                  v-if="activeName=='searchList'"
+                  :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1"
+                >选择
+                </el-button>
+                <el-button
+                  type="text"
+                  icon="el-icon-delete"
+                  size="small"
+                  @click.stop="removeStagList(scope.row,scope.index)"
+                  v-else
+                >移除
+                </el-button>
+              </template>
+            </avue-crud>
           </basic-container>
         </el-col>
       </el-row>
@@ -722,6 +763,11 @@ export default {
         currentPage: 1,
         total: 0
       },
+      pageList: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
       pagePolicy: {
         pageSize: 10,
         currentPage: 1,
@@ -1267,6 +1313,13 @@ export default {
       goodsLoading: false,
       baseURL: '/api/blade-purchase-sales/orderitems/importPrice',
       headers: { "Blade-Auth": 'Bearer ' + getToken()},
+      activeName: 'searchList',
+      // 商品列表数据合计
+      goodsListShow: [],
+      // 商品列表暂存
+      goodsListSave: [],
+      goodsListTotal: 0,
+      goodsListSaveTotal: 0,
     }
   },
   mounted() {
@@ -1793,61 +1846,110 @@ export default {
     },
     //确认导入触发
     importGoods() {
-      // this.contactsData = this.contactsData.concat(this.tableData)
-      if (this.tableData.length > 0) {
-        for (let item in this.tableData) {
-          // this.$set(this.tableData[item], 'storageQuantity', 0)
+      if (this.goodsListSave.length > 0) {
+        for (let item in this.goodsListSave) {
           selectGoodsNum({
-            goodsId: this.tableData[item].id,
-            itemType: this.tableData[item].typeno
+            goodsId: this.goodsListSave[item].id,
+            itemType: this.goodsListSave[item].typeno
           }).then(res => {
-            this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
-            this.tableData[item].storageQuantity =  res.data.data
-            delete this.tableData[item].goodsTypeName
-            this.tableData[item].itemId = this.tableData[item].id
-            this.$set(this.tableData[item], 'itemType', this.tableData[item].typeno)
-            this.$set(this.tableData[item], 'orderQuantity', 0)
-            this.$set(this.tableData[item], 'actualQuantity', 0)
-            this.$set(this.tableData[item], 'purchaseAmount', '0')
-            this.$set(this.tableData[item], 'invoiceWeight', this.tableData[item].cartonWeight)
-            getMarketPrice({code: this.tableData[item].code}).then(res => {
+            this.goodsListSave[item].priceCategory = this.goodsListSave[item].goodsTypeName
+            this.goodsListSave[item].storageQuantity =  res.data.data
+            delete this.goodsListSave[item].goodsTypeName
+            this.goodsListSave[item].itemId = this.goodsListSave[item].id
+            this.$set(this.goodsListSave[item], 'itemType', this.goodsListSave[item].typeno)
+            this.$set(this.goodsListSave[item], 'orderQuantity', 0)
+            this.$set(this.goodsListSave[item], 'actualQuantity', 0)
+            this.$set(this.goodsListSave[item], 'purchaseAmount', '0')
+            this.$set(this.goodsListSave[item], 'invoiceWeight', this.goodsListSave[item].cartonWeight)
+            getMarketPrice({code: this.goodsListSave[item].code}).then(res => {
               if (res.data.data.length > 0) {
-                this.$set(this.tableData[item], 'price', res.data.data[0].salesPrice)
+                this.$set(this.goodsListSave[item], 'price', res.data.data[0].salesPrice)
               } else {
-                this.$set(this.tableData[item], 'price', '0')
+                this.$set(this.goodsListSave[item], 'price', '0')
               }
             })
-            getPurchasePrice({code: this.tableData[item].code}).then(res => {
+            getPurchasePrice({code: this.goodsListSave[item].code}).then(res => {
               if (res.data.data.length > 0) {
-                this.$set(this.tableData[item], 'purchaseAmount', res.data.data[0].purchasePrice)
+                this.$set(this.goodsListSave[item], 'purchaseAmount', res.data.data[0].purchasePrice)
               } else {
-                this.$set(this.tableData[item], 'purchaseAmount', '0')
+                this.$set(this.goodsListSave[item], 'purchaseAmount', '0')
               }
             })
-            this.tableData[item].amount = 0
-            this.tableData[item].sort = this.maxGoodsNum + 1
+            this.goodsListSave[item].amount = 0
+            this.goodsListSave[item].sort = this.maxGoodsNum + 1
             if (this.form.packageRemarks) {
-              this.tableData[item].packageRemarks = this.form.packageRemarks
+              this.goodsListSave[item].packageRemarks = this.form.packageRemarks
             }
-            delete this.tableData[item].id
-            delete this.tableData[item].pid
-            delete this.tableData[item].isDeleted
-            delete this.tableData[item].status
-            delete this.tableData[item].tenantId
-            delete this.tableData[item].updateTime
-            delete this.tableData[item].updateUser
-            delete this.tableData[item].updateUserName
+            delete this.goodsListSave[item].id
+            delete this.goodsListSave[item].pid
+            delete this.goodsListSave[item].isDeleted
+            delete this.goodsListSave[item].status
+            delete this.goodsListSave[item].tenantId
+            delete this.goodsListSave[item].updateTime
+            delete this.goodsListSave[item].updateUser
+            delete this.goodsListSave[item].updateUserName
             this.maxGoodsNum++
-            this.$refs.crudContact.rowCellAdd(this.tableData[item]);
-            this.$refs.crudContact.rowCell(this.tableData[item], this.contactsData.length - 1)
+            this.$refs.crudContact.rowCellAdd(this.goodsListSave[item]);
+            this.$refs.crudContact.rowCell(this.goodsListSave[item], this.contactsData.length - 1)
           })
         }
         this.dialogVisible = false
+      } else {
+        if (this.tableData.length > 0) {
+          for (let item in this.tableData) {
+            selectGoodsNum({
+              goodsId: this.tableData[item].id,
+              itemType: this.tableData[item].typeno
+            }).then(res => {
+              this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
+              this.tableData[item].storageQuantity =  res.data.data
+              delete this.tableData[item].goodsTypeName
+              this.tableData[item].itemId = this.tableData[item].id
+              this.$set(this.tableData[item], 'itemType', this.tableData[item].typeno)
+              this.$set(this.tableData[item], 'orderQuantity', 0)
+              this.$set(this.tableData[item], 'actualQuantity', 0)
+              this.$set(this.tableData[item], 'purchaseAmount', '0')
+              this.$set(this.tableData[item], 'invoiceWeight', this.tableData[item].cartonWeight)
+              getMarketPrice({code: this.tableData[item].code}).then(res => {
+                if (res.data.data.length > 0) {
+                  this.$set(this.tableData[item], 'price', res.data.data[0].salesPrice)
+                } else {
+                  this.$set(this.tableData[item], 'price', '0')
+                }
+              })
+              getPurchasePrice({code: this.tableData[item].code}).then(res => {
+                if (res.data.data.length > 0) {
+                  this.$set(this.tableData[item], 'purchaseAmount', res.data.data[0].purchasePrice)
+                } else {
+                  this.$set(this.tableData[item], 'purchaseAmount', '0')
+                }
+              })
+              this.tableData[item].amount = 0
+              this.tableData[item].sort = this.maxGoodsNum + 1
+              if (this.form.packageRemarks) {
+                this.tableData[item].packageRemarks = this.form.packageRemarks
+              }
+              delete this.tableData[item].id
+              delete this.tableData[item].pid
+              delete this.tableData[item].isDeleted
+              delete this.tableData[item].status
+              delete this.tableData[item].tenantId
+              delete this.tableData[item].updateTime
+              delete this.tableData[item].updateUser
+              delete this.tableData[item].updateUserName
+              this.maxGoodsNum++
+              this.$refs.crudContact.rowCellAdd(this.tableData[item]);
+              this.$refs.crudContact.rowCell(this.tableData[item], this.contactsData.length - 1)
+            })
+          }
+          this.dialogVisible = false
+        }
       }
     },
     closeGoods() {
       this.treeDataGoods = [];
       this.treeDeptId = "";
+      this.activeName = "searchList";
     },
     closeFees() {
       this.treeDeptIdCost = "";
@@ -2087,10 +2189,11 @@ export default {
       console.log(params)
       this.loading = true;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
-        console.log(res)
         const data = res.data.data;
         this.page.total = data.total;
+        this.pageList.total = data.total
         this.data = data.records;
+        this.goodsListShow = data.records;
         this.loading = false;
       });
     },
@@ -2423,8 +2526,21 @@ export default {
       }
       return sums;
     },
-    getCorpData(row) {
-      console.log(row)
+    // 标签页切换
+    tabHandle(data) {
+      if (data.name == 'searchList') {
+        this.goodsListShow = this.data;
+        this.page.total = this.pageList.total
+      } else if (data.name == 'importStaging') {
+        this.goodsListShow = this.goodsListSave;
+        this.page.total = 0
+      }
+    },
+    removeStagList(row, index) {
+      this.goodsListSave.splice(index, 1)
+    },
+    importStagList(row, index) {
+      this.goodsListSave.push(row);
     },
   }
 }

src/views/financialManagement/billDetails/configuration/mainList.json

@@ -66,7 +66,7 @@
       "index": 4
     },
     {
-      "label": "单据状态",
+      "label": "单据来源",
       "prop": "billType",
       "type": "select",
       "search": true,

src/views/financialManagement/paymentRequest/configuration/mainList.json

@@ -20,7 +20,7 @@
   "searchIcon": true,
   "searchIndex": 2,
   "addBtn":false,
-  "expand": true,
+  "expand": false,
   "expandWidth": 38,
   "selectionWidth": 40,
   "showSummary": true,
@@ -84,13 +84,20 @@
       ]
     },
     {
-      "label": "总金额",
+      "label": "人民币金额",
       "prop": "amount",
       "overHidden": true,
       "width": 120,
       "index": 4
     },
     {
+      "label": "外币金额",
+      "prop": "foreignAmount",
+      "overHidden": true,
+      "width": 120,
+      "index": 4
+    },
+    {
       "label": "开户银行",
       "prop": "accountBank",
       "overHidden": true,

src/views/financialManagement/paymentRequest/paymentRequest.vue

@@ -37,6 +37,7 @@
         <el-button
           type="text"
           size="small"
+          :disabled="scope.row.checkStatus == '审核中' ||  scope.row.checkStatus == '请核成功'"
           @click.stop="rowDel(scope.row, scope.index)"
         >删除
         </el-button>

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -129,7 +129,7 @@
 <script>
   import itemOption from "./configuration/detailsPage.json";
   import { contrastObj,contrastList } from "@/util/contrastData";
-  import { getDetails,modify,submit, paymentCheck,getlistBankBy } from "@/api/financialManagement/paymentRequest";
+  import { getDetails,modify,submit, paymentCheck,getlistBankBy,saveOrEdit } from "@/api/financialManagement/paymentRequest";
   import _ from "lodash";
 
   export default {
@@ -235,7 +235,7 @@
               ]
             },
             {
-              label: '总金额',
+              label: '人民币金额',
               prop: 'amount',
               span: 8,
               rules: [
@@ -247,6 +247,18 @@
               ]
             },
             {
+              label: '外币金额',
+              prop: 'foreignAmount',
+              span: 8,
+              rules: [
+                {
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
               label: '申请人',
               prop: 'createUserName',
               span: 8,
@@ -445,7 +457,7 @@
               itemsList:this.dataList
             }
             this.buttonLoading = true
-            submit(params).then(res =>{
+            saveOrEdit(params).then(res =>{
               this.$message.success("操作成功!")
               this.afterEcho(res.data.data)
             }).finally(()=>{

src/views/financialManagement/paymentSettle/configuration/mainList.json

@@ -79,13 +79,20 @@
       ]
     },
     {
-      "label": "金额",
+      "label": "人民币金额",
       "prop": "amount",
       "overHidden": true,
       "width": 120,
       "index": 5
     },
     {
+      "label": "外币金额",
+      "prop": "foreignAmount",
+      "overHidden": true,
+      "width": 120,
+      "index": 5
+    },
+    {
       "label": "结算日期",
       "prop": "settlementDate",
       "overHidden": true,

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -231,7 +231,7 @@
               ]
             },
             {
-              label: '总金额',
+              label: '人民币金额',
               prop: 'amount',
               span: 8,
               rules: [
@@ -248,23 +248,36 @@
               ]
             },
             {
-              label: '制单人',
-              prop: 'createUserName',
+              label: '外币金额',
+              prop: 'foreignAmount',
               span: 8,
-              disabled:true,
               rules: [
                 {
-                  required: false,
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '制单日期',
-              prop: 'createTime',
+              label: '付款日期',
+              prop: 'settlementDate',
+              format:"yyyy-MM-dd",
+              valueFormat:"yyyy-MM-dd 00:00:00",
               span: 8,
               type:"date",
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '制单人',
+              prop: 'createUserName',
+              span: 8,
               disabled:true,
               rules: [
                 {
@@ -275,12 +288,11 @@
               ]
             },
             {
-              label: '付款日期',
-              prop: 'settlementDate',
-              format:"yyyy-MM-dd",
-              valueFormat:"yyyy-MM-dd 00:00:00",
+              label: '制单日期',
+              prop: 'createTime',
               span: 8,
               type:"date",
+              disabled:true,
               rules: [
                 {
                   required: false,
@@ -379,10 +391,10 @@
         })
       },
       thisAmountChange(row){
-        if(row.thisAmount > row.maxThisAmount){
-          this.$message.error("本次结算金额不能大于剩余结算金额!")
-          row.thisAmount = 0;
-        }
+        // if(row.thisAmount > row.maxThisAmount){
+        //   this.$message.error("本次结算金额不能大于剩余结算金额!")
+        //   row.thisAmount = 0;
+        // }
       },
       selectPurchase(){
         if(!this.form.corpId){

src/views/financialManagement/receiptSettle/configuration/mainList.json

@@ -79,13 +79,20 @@
       ]
     },
     {
-      "label": "总金额",
+      "label": "人民币金额",
       "prop": "amount",
       "overHidden": true,
       "width": 120,
       "index": 5
     },
     {
+      "label": "外币金额",
+      "prop": "foreignAmount",
+      "overHidden": true,
+      "width": 120,
+      "index": 5
+    },
+    {
       "label": "收款日期",
       "prop": "settlementDate",
       "overHidden": true,

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -241,23 +241,22 @@
               ]
             },
             {
-              label: '制单人',
-              prop: 'createUserName',
+              label: '外币金额',
+              prop: 'foreignAmount',
               span: 8,
-              disabled:true,
               rules: [
                 {
-                  required: false,
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
-            }, {
-              label: '制单日期',
-              prop: 'createTime',
+            },
+            {
+              label: '收款日期',
+              prop: 'time',
               span: 8,
               type:"date",
-              disabled:true,
               rules: [
                 {
                   required: false,
@@ -267,10 +266,23 @@
               ]
             },
             {
-              label: '收款日期',
-              prop: 'time',
+              label: '制单人',
+              prop: 'createUserName',
+              span: 8,
+              disabled:true,
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '制单日期',
+              prop: 'createTime',
               span: 8,
               type:"date",
+              disabled:true,
               rules: [
                 {
                   required: false,

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -9,9 +9,16 @@
       <div class="upper_right_button">
         <el-button type="primary"
                    size="small"
+                   v-if="viewDisabled"
+                   class="el-button--small-yh "
+                   :loading="buttonLoading"
+                   @click.stop="openDisabled()">编辑
+        </el-button>
+        <el-button type="primary"
+                   size="small"
                    :loading="buttonLoading"
                    class="el-button--small-yh"
-                   :disabled="!form.id"
+                   :disabled="!form.id || viewDisabled"
                    @click.stop="confirmGoods">
           {{goodsDisable ? "撤回发货":"确认发货"}}
         </el-button>
@@ -27,7 +34,7 @@
           type="primary"
           size="small"
           :loading="buttonLoading"
-          :disabled="disabled  || goodsDisable"
+          :disabled="disabled  || goodsDisable || viewDisabled"
           @click="editCustomer"
         >{{ form.id ? '确认修改' : '确认新增' }}
         </el-button>
@@ -213,14 +220,14 @@
               <el-button
                 type="text"
                 size="small"
-                :disabled="goodsDisable"
+                :disabled="goodsDisable || viewDisabled"
                 @click="rowCell(row,index)"
               >{{ row.$cellEdit ? '保存' : '修改' }}
               </el-button>
               <el-button
                 type="text"
                 size="small"
-                :disabled="goodsDisable"
+                :disabled="goodsDisable || viewDisabled"
                 @click="rowDel(row,index)"
               >删除
               </el-button>
@@ -229,7 +236,7 @@
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
-                         :disabled="goodsDisable"
+                         :disabled="goodsDisable || viewDisabled"
                          @click="openMarketDialog"
               >导入明细
               </el-button>
@@ -310,6 +317,7 @@ export default {
       disabled: false,
       goodsDisable: false,
       marketDialog: false,
+      viewDisabled:false,
       customerContact: customerContact,
       contactsForm: {},
       marketParams:{},
@@ -501,6 +509,11 @@ export default {
     getStorage().then(res => {
       this.storageIdDic = res.data
     })
+
+    if(this.detailData.view){
+      this.viewDisabled = true
+    }
+
     if (this.detailData.id) {
       this.buttonLoading = true;
       let id = this.detailData.id.replace(/\"/g, "")
@@ -738,6 +751,9 @@ export default {
       this.sumOrderNo();   //合并合同号
       this.marketDialog = false;
     },
+    openDisabled(){
+      this.viewDisabled = false
+    },
     //选择货物品种
     choice(row) {
       this.dialogVisible = true;

src/views/importTrade/invoice/index.vue

@@ -61,6 +61,12 @@
         >删除
         </el-button>
       </template>
+      <template slot-scope="scope" slot="orderNo">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orderNo }}</span>
+      </template>
+      <template slot-scope="scope" slot="corpsName">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.corpsName }}</span>
+      </template>
     </avue-crud>
   </basic-container>
   <detail-page
@@ -195,6 +201,7 @@ export default {
     beforeOpenPage(row, status) {
       this.detailData = {
         id: row.id,
+        view:true,
         status: status
       };
       this.show = false;

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -9,9 +9,16 @@
       <div class="upper_right_button">
         <el-button type="primary"
                    size="small"
+                   v-if="viewDisabled"
+                   class="el-button--small-yh "
+                   :loading="buttonLoading"
+                   @click.stop="openDisabled()">编辑
+        </el-button>
+        <el-button type="primary"
+                   size="small"
                    class="el-button--small-yh"
                    :loading="buttonLoading"
-                   :disabled="!form.id"
+                   :disabled="!form.id || viewDisabled"
                    @click.stop="confirmReceipt">
           {{receiptDisable ?"撤销收货":"确认收货"}}
         </el-button>
@@ -26,7 +33,7 @@
           class="el-button--small-yh"
           type="primary"
           size="small"
-          :disabled="disabled || receiptDisable"
+          :disabled="disabled || receiptDisable || viewDisabled"
           :loading="buttonLoading"
           @click="editCustomer"
         >{{ form.id ? '确认修改' : '确认新增' }}
@@ -207,14 +214,14 @@
               <el-button
                 type="text"
                 size="small"
-                :disabled="receiptDisable"
+                :disabled="receiptDisable  || viewDisabled"
                 @click="rowCell(row,index)"
               >{{ row.$cellEdit ? '修改完成' : '修改' }}
               </el-button>
               <el-button
                 type="text"
                 size="small"
-                :disabled="receiptDisable"
+                :disabled="receiptDisable  || viewDisabled"
                 @click="rowDel(row,index)"
               >删除
               </el-button>
@@ -223,7 +230,7 @@
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
-                         :disabled="receiptDisable"
+                         :disabled="receiptDisable  || viewDisabled"
                          @click="commoditySelection"
               >导入明细
               </el-button>
@@ -299,6 +306,7 @@ export default {
       skip:false,
       buttonLoading:false,
       receiptDisable:false,
+      viewDisabled:false,
       customerContact: customerContact,
       contactsForm: {},
       contactsData: [],
@@ -490,6 +498,11 @@ export default {
     getStorage().then(res =>{
       this.storageIdDic = res.data
     })
+
+    if(this.detailData.view){
+      this.viewDisabled = true
+    }
+
     if (this.detailData.id) {
       this.buttonLoading = true;
       let id = this.detailData.id.replace(/\"/g, "")
@@ -849,6 +862,9 @@ export default {
       this.sumOrderNo();   //合并合同号
       this.procurementDialog = false;
     },
+    openDisabled(){
+      this.viewDisabled = false
+    },
     //上传文件保存
     upLoadSave(row, done, loading){
       this.upLoadData.push(row)

src/views/importTrade/receipt/index.vue

@@ -60,6 +60,12 @@
         >删除
         </el-button>
       </template>
+      <template slot-scope="scope" slot="orderNo">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orderNo }}</span>
+      </template>
+      <template slot-scope="scope" slot="corpsName">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.corpsName }}</span>
+      </template>
     </avue-crud>
   </basic-container>
   <detail-page
@@ -194,6 +200,7 @@ export default {
     beforeOpenPage(row, status) {
       this.detailData = {
         id: row.id,
+        view:true,
         status: status
       };
       this.show = false;

src/views/maintenance/integral/config/mainList.json

@@ -0,0 +1,53 @@
+{
+  "searchShow": true,
+  "searchMenuSpan": 8,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "addBtn": false,
+  "align": "center",
+  "menuWidth": "120",
+  "menu": false,
+  "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "selection": true,
+  "tip":false,
+  "column": [
+    {
+      "label": "客户",
+      "prop": "corpId",
+      "search": true,
+      "index": 1,
+      "minWidth": 80,
+      "overHidden": true,
+      "searchSpan": 8
+    },{
+      "label": "积分",
+      "prop": "a",
+      "search": false,
+      "index": 2,
+      "minWidth": 80,
+      "overHidden": true,
+      "searchSpan": 8
+    },{
+      "label": "兑换",
+      "prop": "b",
+      "search": false,
+      "index": 3,
+      "minWidth": 80,
+      "overHidden": true,
+      "searchSpan": 8
+    },{
+      "label": "积分余额",
+      "prop": "c",
+      "search": false,
+      "index": 4,
+      "minWidth": 80,
+      "overHidden": true,
+      "searchSpan": 8
+    }
+  ]
+}

src/views/maintenance/integral/index.vue

@@ -0,0 +1,76 @@
+<template>
+  <div>
+    <basic-container>
+      <avue-crud
+        :option="option"
+        :data="dataList"
+        ref="crud"
+        v-model="form"
+        :page.sync="page"
+        :search.sync="search"
+        @search-change="searchChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+        :table-loading="loading"
+        @saveColumn="saveColumn"
+      ></avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import option from './config/mainList.json'
+
+export default {
+  name: "index",
+  data() {
+    return {
+      option: {},
+      dataList: [],
+      form: {},
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0,
+      },
+      search: {},
+      loading: false,
+    }
+  },
+  created() {
+    this.option = option
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 3 !== 0){
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
+  },
+  methods: {
+    searchChange(params, done) {
+      done();
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    onLoad(page, params) {},
+    async saveColumn() {},
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/maintenance/overpayment/config/mainList.json

@@ -0,0 +1,53 @@
+{
+  "searchShow": true,
+  "searchMenuSpan": 8,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "addBtn": false,
+  "align": "center",
+  "menuWidth": "120",
+  "menu": false,
+  "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "selection": true,
+  "tip":false,
+  "column": [
+    {
+      "label": "客户",
+      "prop": "corpId",
+      "search": true,
+      "index": 1,
+      "minWidth": 80,
+      "overHidden": true,
+      "searchSpan": 8
+    },{
+      "label": "增加",
+      "prop": "a",
+      "search": false,
+      "index": 2,
+      "minWidth": 80,
+      "overHidden": true,
+      "searchSpan": 8
+    },{
+      "label": "使用",
+      "prop": "b",
+      "search": false,
+      "index": 3,
+      "minWidth": 80,
+      "overHidden": true,
+      "searchSpan": 8
+    },{
+      "label": "余额",
+      "prop": "c",
+      "search": false,
+      "index": 4,
+      "minWidth": 80,
+      "overHidden": true,
+      "searchSpan": 8
+    }
+  ]
+}

src/views/maintenance/overpayment/index.vue

@@ -0,0 +1,76 @@
+<template>
+  <div>
+    <basic-container>
+      <avue-crud
+        :option="option"
+        :data="dataList"
+        ref="crud"
+        v-model="form"
+        :page.sync="page"
+        :search.sync="search"
+        @search-change="searchChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+        :table-loading="loading"
+        @saveColumn="saveColumn"
+      ></avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import option from './config/mainList.json';
+
+export default {
+  name: "index",
+  data() {
+    return {
+      option: {},
+      dataList: [],
+      form: {},
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0,
+      },
+      search: {},
+      loading: false,
+    }
+  },
+  created() {
+    this.option = option
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 3 !== 0){
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
+  },
+  methods: {
+    searchChange(params, done) {
+      done();
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    onLoad(page, params) {},
+    async saveColumn() {},
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/purchase/contract/detailsPage.vue

@@ -5,31 +5,25 @@
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
-      <div class="upper_right_button">
+      <div v-if="!checkDisabled"  class="upper_right_button">
         <el-button type="primary"
-                   class="el-button--small-yh"
                    size="small"
+                   v-if="viewDisabled"
+                   class="el-button--small-yh "
                    :loading="buttonLoading"
-                   :disabled="true"
-                   @click.stop="">请核
+                   @click.stop="openDisabled()">编辑
         </el-button>
         <el-button type="warning"
                    size="small"
                    class="el-button--small-yh "
                    :loading="buttonLoading"
-                   :disabled="!form.id"
+                   :disabled="!form.id || viewDisabled"
                    @click.stop="applyPayment('申请')">申请货款
         </el-button>
-<!--        <el-button type="warning"
-                   size="small"
-                   class="el-button&#45;&#45;small-yh "
-                   :loading="buttonLoading"
-                   @click.stop="applyPayment()">取消货款
-        </el-button>-->
         <el-button type="info"
                    size="small"
                    :loading="buttonLoading"
-                   :disabled="!form.id"
+                   :disabled="!form.id  || viewDisabled"
                    @click="openApplicationDialog"
         >查看申请记录
         </el-button>
@@ -37,7 +31,7 @@
                    size="small"
                    class="el-button--small-yh "
                    :loading="buttonLoading"
-                   :disabled="!form.id"
+                   :disabled="!form.id  || viewDisabled"
                    @click.stop="applyPayment('收费')">退款
         </el-button>
         <el-button type="success"
@@ -51,12 +45,28 @@
           class="el-button--small-yh "
           type="primary"
           size="small"
-          :disabled="disabled"
+          :disabled="disabled  || viewDisabled"
           @click="editCustomer"
           :loading="buttonLoading"
         >{{form.id?'确认修改':'确认新增'}}
         </el-button>
       </div>
+        <div v-if="checkDisabled" class="upper_right_button">
+          <el-button type="success"
+                     size="small"
+                     class="el-button--small-yh"
+                     :loading="buttonLoading"
+                     @click.stop="approveOperation(1)">
+            审核通过
+          </el-button>
+          <el-button type="warning"
+                     size="small"
+                     class="el-button--small-yh"
+                     :loading="buttonLoading"
+                     @click.stop="approveOperation(2)">
+            审核驳回
+          </el-button>
+        </div>
     </div>
     </div>
     <div class="customer-main">
@@ -230,14 +240,14 @@
               <el-button
                 type="text"
                 size="small"
-                :disabled="row.actualQuantity !=0"
+                :disabled="row.actualQuantity !=0 || checkDisabled || viewDisabled"
                 @click="rowCell(row,index)"
               >{{ row.$cellEdit ? '修改完成' : '修改' }}
               </el-button>
               <el-button
                 type="text"
                 size="small"
-                :disabled="row.actualQuantity !=0"
+                :disabled="row.actualQuantity !=0 || checkDisabled || viewDisabled"
                 @click="rowDel(row,index)"
               >删除
               </el-button>
@@ -246,12 +256,14 @@
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
+                         :disabled=" checkDisabled || viewDisabled"
                          @click="commoditySelection"
               >录入明细
               </el-button>
               <el-button type="warning"
                          size="small"
-                         :disabled="selectContact.length == 0"
+
+                         :disabled="selectContact.length == 0 || checkDisabled || viewDisabled"
                          @click="beforePage(false)"
               >生成收货单
               </el-button>
@@ -261,12 +273,14 @@
         <fee-info
           ref="feeInfo"
           :orderFeesList="orderFeesList"
+          :disabled="checkDisabled || viewDisabled"
           @beforeFinance="beforeFinance"
           feeUrl=""
         />
         <upload-file
           ref="uploadFile"
           title="合同附件"
+          :disabled="checkDisabled || viewDisabled"
           :orderFilesList="orderFilesList"
           delUrl=""
         />
@@ -302,6 +316,7 @@
       v-dialog-drag
     >
       <apply-payment
+        :billUrl="billUrl"
         :billType="billType"
         :billData="billData"
         @choceFun="choceFun"
@@ -326,6 +341,8 @@ import  billApplication from "@/components/bill/billApplication";
 import { corpsattn } from "@/api/basicData/configuration"
 import { contrastObj,contrastList } from "@/util/contrastData";
 import ApplyPayment from "../../../components/finance/applyPayment";
+import { approvePass } from "@/api/approveData/main"
+
 export default {
   name: "detailsPage",
   props: {
@@ -351,7 +368,10 @@ export default {
       applicationDialog:false,
       commodityData: false,
       takeDisabled:false, //收货状态
+      checkDisabled:false,
+      viewDisabled:false,
       tableData: [],
+      billUrl:"/purchase/contract/index",
       billType:"",
       billData:{},
       contractTypeDic:[],
@@ -682,7 +702,7 @@ export default {
             ]
           },
           {
-            label: '已付金额',
+            label: '已付人民币金额',
             prop: 'settlmentAmount',
             disabled: true,
             rules: [
@@ -694,6 +714,18 @@ export default {
             ]
           },
           {
+            label: '已付外币金额',
+            prop: 'foreignSettlmentAmount',
+            disabled: true,
+            rules: [
+              {
+                pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '发票重量',
             prop: 'invoiceWeight',
             disabled: true,
@@ -741,6 +773,11 @@ export default {
     this.getWorkDicts("payment_term").then(res =>{
       this.paymentTypeDic = res.data.data
     })
+
+    if(this.detailData.view){
+      this.viewDisabled = true
+    }
+
     if (this.detailData.id) {
       this.buttonLoading = true;
       let id = this.detailData.id.replace(/\"/g, "")
@@ -750,7 +787,17 @@ export default {
       }).finally(()=>{
         this.buttonLoading = false;
       })
-    }else{
+    } if(this.detailData.check){
+      this.checkDisabled = true
+      this.buttonLoading = true;
+      detailListData(this.detailData.check.billId).then(res => {
+        this.form = res.data.data;
+        this.afterEcho(res.data.data)
+      }).finally(()=>{
+        this.buttonLoading = false;
+      })
+    }
+    else{
       this.$set(this.form,"currency","USD")
       this.$set(this.form,"exchangeRate",6.3686)
     }
@@ -816,31 +863,37 @@ export default {
     beforeFinance(feesData,callback){
       this.orderFeesList = feesData;
       let params = {}
-      if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
-        || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
-      ){
-        this.$confirm("数据发生变化，请先提交保存？", {
-          confirmButtonText: "保存",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.editCustomer();
-        }).finally(()=>{
-          params.valid = false
-          callback(params)
-        })
-      }else{
-        params.valid = true
-        params.parentId = this.form.id
-        callback(params)
-      }
+      params.valid = true
+      params.parentId = this.form.id
+      params.srcOrderno = this.form.orderNo
+      callback(params)
+
+      //传过来的数据  会根据应收应付的顺序放到 orderFeesList   这个时候与旧值对比  会对比失败  后端查费用明细时  按照应收应付顺序 进行排序
+      // if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
+      //   || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
+      // ){
+      //   this.$confirm("数据发生变化，请先提交保存？", {
+      //     confirmButtonText: "保存",
+      //     cancelButtonText: "取消",
+      //     type: "warning"
+      //   }).then(() => {
+      //     this.editCustomer();
+      //   }).finally(()=>{
+      //     params.valid = false
+      //     callback(params)
+      //   })
+      // }else{
+      //   params.valid = true
+      //   params.parentId = this.form.id
+      //   params.srcOrderno = this.form.orderNo
+      //   callback(params)
+      // }
     },
     //修改提交触发
     editCustomer(status) {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           let orderFeesList = this.$refs.feeInfo.submitData();
-          console.log(orderFeesList)
           for (let i = 0; i < orderFeesList.length; i++) {
             if (orderFeesList[i].corpId === (null || "")) {
               return this.$message.error(`请输入费用明细第${i + 1}行的结算中心`);
@@ -939,6 +992,9 @@ export default {
         this.oldFilesList = this.deepClone(form.orderFilesList)
       }
     },
+    openDisabled(){
+      this.viewDisabled = false
+    },
     selectionContact(row){
       this.selectContact = row;
     },
@@ -1022,6 +1078,7 @@ export default {
         currency:this.form.currency,
         exchangeRate:this.form.exchangeRate,
         srcParentId:this.form.id,
+        srcType:1
       }
       if(bool){ //申请货款
         this.billData.srcId = -1
@@ -1044,6 +1101,17 @@ export default {
         this.applyPaymentDialog = true;
       }
     },
+    approveOperation(operate){
+      this.detailData.check.operate = operate
+      this.buttonLoading = true;
+      approvePass(this.detailData.check).then(res=>{
+        this.$message.success("操作成功!")
+
+        //操作成功之后需要 禁用通过驳回吗》‘
+      }).finally(()=>{
+        this.buttonLoading = false
+      })
+    },
     //新增商品明细保存触发
     rowSave(row, done, loading) {
       // this.contactsData.push(row)

src/views/purchase/contract/index.vue

@@ -78,6 +78,12 @@
           >删除
           </el-button>
         </template>
+        <template slot-scope="scope" slot="orderNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orderNo }}</span>
+        </template>
+        <template slot-scope="scope" slot="strCorpName">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.strCorpName }}</span>
+        </template>
       </avue-crud>
     </basic-container>
     <detail-page
@@ -127,6 +133,16 @@ export default {
   async created() {
     // this.option = await this.getColumnData(this.getColumnName(36), option);
   },
+  activated() {
+    setTimeout(() => {
+      if(this.$route.query.check){
+        this.detailData={
+          check:this.$route.query.check
+        }
+        this.show = false;
+      }
+    }, 100);
+  },
   mounted() {
 
   },
@@ -173,7 +189,6 @@ export default {
     //查询全部
     initData() {
       customerList().then(res => {
-        console.log(this.form);
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
       });
@@ -190,6 +205,7 @@ export default {
     beforeOpenPage(row, status) {
       this.detailData = {
         id: row.id,
+        view:true,
         status: status
       };
       this.show = false;

src/views/salesManagement/salesContract/detailsPage.vue

@@ -9,22 +9,29 @@
       <div class="upper_right_button">
         <el-button type="primary"
                    size="small"
-                   class="el-button--small-yh"
-                   :disabled="true"
+                   v-if="viewDisabled"
+                   class="el-button--small-yh "
                    :loading="buttonLoading"
-                   @click.stop="">请核
+                   @click.stop="openDisabled()">编辑
         </el-button>
+<!--        <el-button type="primary"-->
+<!--                   size="small"-->
+<!--                   class="el-button&#45;&#45;small-yh"-->
+<!--                   :disabled="true"-->
+<!--                   :loading="buttonLoading"-->
+<!--                   @click.stop="">请核-->
+<!--        </el-button>-->
         <el-button type="warning"
                    size="small"
                    class="el-button--small-yh"
-                   :disabled="!form.id"
+                   :disabled="!form.id || viewDisabled"
                    :loading="buttonLoading"
                    @click.stop="applySettlement('收费')">生成账单
         </el-button>
         <el-button type="warning"
                    size="small"
                    class="el-button--small-yh"
-                   :disabled="!form.id"
+                   :disabled="!form.id  || viewDisabled"
                    :loading="buttonLoading"
                    @click.stop="applySettlement('申请')">退款
         </el-button>
@@ -39,7 +46,7 @@
           class="el-button--small-yh"
           type="primary"
           size="small"
-          :disabled="disabled"
+          :disabled="disabled || viewDisabled"
           :loading="buttonLoading"
           @click="editCustomer"
         >{{form.id?'确认修改':'确认新增'}}
@@ -213,11 +220,12 @@
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
+                         :disabled="  viewDisabled"
                          @click="newDetails"
               >录入明细</el-button>
               <el-button type="warning"
                          size="small"
-                         :disabled="selection.length < 1"
+                         :disabled="selection.length < 1  || viewDisabled"
                          @click="generateShipmentD"
               >生成发货单
               </el-button>
@@ -232,12 +240,14 @@
               <el-button
                 type="text"
                 size="small"
+                :disabled="  viewDisabled"
                 @click="rowCell(row,index)"
               >{{ row.$cellEdit ? '修改完成' : '修改' }}
               </el-button>
               <el-button
                 type="text"
                 size="small"
+                :disabled="  viewDisabled"
                 @click="rowDelList(row,index)"
               >删除
               </el-button>
@@ -246,13 +256,16 @@
         </basic-container>
         <fee-info
           ref="feeInfo"
+          @beforeFinance="beforeFinance"
+          :disabled=" viewDisabled"
           :orderFeesList="orderFeesList"
           feeUrl=""
         />
         <upload-file
           ref="uploadFile"
           title="合同附件"
-          :orderFilesList="orderFilesList"
+          :disabled=" viewDisabled"
+          :orderFilesList="orderFilesList || viewDisabled"
           delUrl=""
         />
       </el-form>
@@ -291,6 +304,7 @@
       v-dialog-drag
     >
       <apply-payment
+        :billUrl="billUrl"
         :billType="billType"
         :billData="billData"
         @choceFun="choceFun"
@@ -336,12 +350,14 @@ export default {
       buttonLoading:false,
       dialogCommodity: false,
       applySettlementDialog:false,
+      viewDisabled:false,
       form: {},
       orderFeesList:[],
       orderFilesList:[],
       currencyDic:[],
       contractDic:[],
       selectKind:-1,
+      billUrl:"",
       billType:"",
       billData:{},
       configuration:{
@@ -519,7 +535,7 @@ export default {
             ]
           },
           {
-            label: '已收金额',
+            label: '已收人民币金额',
             prop: 'settlmentAmount',
             disabled: true,
             rules: [
@@ -536,11 +552,16 @@ export default {
             ]
           },
           {
-            label: '发票重量',
-            prop: 'invoiceWeight',
+            label: '已收外币金额',
+            prop: 'foreignSettlmentAmount',
             disabled: true,
             rules: [
               {
+                pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                message: ' ',
+                trigger: 'blur'
+              },
+              {
                 required: false,
                 message: ' ',
                 trigger: 'blur'
@@ -548,9 +569,9 @@ export default {
             ]
           },
           {
-            label: '码单重量',
-            prop: 'billWeight',
-            disabled: true,
+            label: '计划交期',
+            prop: 'plannedDeliveryDate',
+            type: 'datetime',
             rules: [
               {
                 required: false,
@@ -560,16 +581,11 @@ export default {
             ]
           },
           {
-            label: '结余金额',
-            prop: '',
+            label: '发票重量',
+            prop: 'invoiceWeight',
             disabled: true,
             rules: [
               {
-                pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-                message: ' ',
-                trigger: 'blur'
-              },
-              {
                 required: false,
                 message: ' ',
                 trigger: 'blur'
@@ -577,9 +593,9 @@ export default {
             ]
           },
           {
-            label: '计划交期',
-            prop: 'plannedDeliveryDate',
-            type: 'datetime',
+            label: '码单重量',
+            prop: 'billWeight',
+            disabled: true,
             rules: [
               {
                 required: false,
@@ -705,6 +721,9 @@ export default {
     this.getWorkDicts("currency").then(res =>{
       this.currencyDic = res.data.data
     })
+    if(this.detailData.view){
+      this.viewDisabled = true
+    }
     if (this.detailData.id) {
       this.buttonLoading = true;
       let id = this.detailData.id.replace(/\"/g, "")
@@ -808,6 +827,35 @@ export default {
         this.billData.srcId = -1
       }
     },
+    beforeFinance(feesData,callback) {
+      this.orderFeesList = feesData;
+      let params = {}
+      params.valid = true
+      params.parentId = this.form.id
+      params.srcOrderno = this.form.orderNo
+      callback(params)
+
+      //传过来的数据  会根据应收应付的顺序放到 orderFeesList   这个时候与旧值对比  会对比失败  后端查费用明细时  按照应收应付顺序 进行排序
+      // if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
+      //   || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
+      // ){
+      //   this.$confirm("数据发生变化，请先提交保存？", {
+      //     confirmButtonText: "保存",
+      //     cancelButtonText: "取消",
+      //     type: "warning"
+      //   }).then(() => {
+      //     this.editCustomer();
+      //   }).finally(()=>{
+      //     params.valid = false
+      //     callback(params)
+      //   })
+      // }else{
+      //   params.valid = true
+      //   params.parentId = this.form.id
+      //   params.srcOrderno = this.form.orderNo
+      //   callback(params)
+      // }
+    },
     //申请结算
     applySettlement(type){
       if(contrastObj(this.form,this.oldForm) || contrastList(this.importInventoryData,this.oldInventoryData)
@@ -1109,6 +1157,9 @@ export default {
         this.totalChange()
       })
     },
+    openDisabled(){
+      this.viewDisabled = false
+    },
     backToList() {
       if(contrastObj(this.form,this.oldForm) || contrastList(this.importInventoryData,this.oldInventoryData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)

src/views/salesManagement/salesContract/index.vue

@@ -69,6 +69,12 @@
         >删除
         </el-button>
       </template>
+      <template slot-scope="scope" slot="orderNo">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orderNo }}</span>
+      </template>
+      <template slot-scope="scope" slot="corpsName">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.corpsName }}</span>
+      </template>
     </avue-crud>
   </basic-container>
   <detail-page
@@ -99,6 +105,7 @@ export default {
       form: {},
       detailData:{},
       search: {},
+      viewDisabled:false,
       configuration:{
         multipleChoices:false,
         multiple:false,
@@ -157,7 +164,7 @@ export default {
     beforeOpenPage(row, index) {
       this.detailData = {
         id: row.id,
-        status: status
+        view:true,
       };
       this.show = false;
     },
@@ -191,6 +198,9 @@ export default {
       this.onLoad(this.page, params);
       done()
     },
+    openDisabled(){
+      this.viewDisabled = false
+    },
     searchReset() {
       console.log('1')
     },