提交达沃特、统计,标书

src/enums/column-name.js

@@ -1048,6 +1048,9 @@ const columnName = [{
 }, {
   code: 253,
   name: '统计分析-利润统计'
+}, {
+  code: 254,
+  name: '海运出口-列表'
 }]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/router/views/index.js

@@ -2302,5 +2302,31 @@ export default [{
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/purchase/rubberStock/index')
   }]
+}, {
+  path: '/statisticAnalysis/accountBalanceD/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/statisticAnalysis/accountBalanceD/index',
+    name: '应收账款余额',
+    meta: {
+      i18n: '/statisticAnalysis/accountBalanceD/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/accountBalanceD/index')
+  }]
+}, {
+  path: '/statisticAnalysis/accountBalanceC/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/statisticAnalysis/accountBalanceC/index',
+    name: '应付账款余额',
+    meta: {
+      i18n: '/statisticAnalysis/accountBalanceC/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/statisticAnalysis/accountBalanceC/index')
+  }]
 }
 ]

src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -61,7 +61,7 @@
       </avue-crud>
     </trade-card>
     <trade-card title="代理信息">
-      <avue-crud ref="crudAgent" :key="key" :option="optionAgent" :data="dataListAgent"
+      <avue-crud ref="crudAgent" :key="key" :option="optionAgent" :data="dataListAgent" @row-update="rowUpdate"  @row-save="rowSave"
                  @resetColumn="resetColumn('crudAgent','optionAgent','optionAgentTwo',201.2)"
                  @saveColumn="saveColumn('crudAgent','optionAgent','optionAgentTwo',201.2)">
         <template slot-scope="{row,index}" slot="menu">
@@ -69,7 +69,7 @@
               type="text"
               size="small"
               :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
-              @click="edit(row)"
+              @click="edit(row,index,false)"
           >{{ row.$cellEdit ? '确 认' : '编 辑' }}
           </el-button>
           <el-button
@@ -629,12 +629,17 @@ export default {
           prop: 'agentId',
           filterable:true,
           cell: true,
-          dicUrl: '/api/blade-client/corpsdesc/bidingCorpsList',
+          dicUrl: '/api/blade-client/corpsdesc/bidingCorpsList?corpsTypeName=货代',
           type: 'select',
           props: {
             label: "cname",
             value: "id"
           },
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
           index:1,
         }, {
           label: '联系人',
@@ -912,13 +917,23 @@ export default {
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
     },
-    edit(row){
-      if (row.$cellEdit){
-        this.$set(row,'$cellEdit',false)
+    edit(row,index,type = true){
+      if (!type){
+        this.$refs.crudAgent.rowCell(row, index)
       }else {
-        this.$set(row,'$cellEdit',true)
+        if (row.$cellEdit){
+          this.$set(row,'$cellEdit',false)
+        }else {
+          this.$set(row,'$cellEdit',true)
+        }
       }
     },
+    rowSave(form, done) {
+      done()
+    },
+    rowUpdate(form, index, done) {
+      done()
+    },
     rowDel(row, index, type) {
       this.$confirm('是否确认删除?', '提示', {
         confirmButtonText: '确定',

src/views/maintenance/rebate/index.vue

@@ -96,6 +96,7 @@ export default {
             label: '订单号',
             prop: 'orderNo',
             width: 100,
+            cell: true,
             overHidden: true
           }, {
             label: '变动总返利',

src/views/statisticAnalysis/accountBalanceC/index.vue

@@ -109,6 +109,10 @@ export default {
           name: 'openingAmount',
           type: 'sum',
           decimals: 2
+        },{
+          name: 'caseOverPayment',
+          type: 'sum',
+          decimals: 2
         }],
         column: [{
           label: '工厂',
@@ -139,6 +143,10 @@ export default {
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
         },{
+          label: '使用溢付款',
+          prop: 'caseOverPayment',
+          overHidden: true,
+        },{
           label: '溢付款余额',
           prop: 'inOverpayment',
           overHidden: true,

src/views/statisticAnalysis/accountBalanceD/index.vue

@@ -110,6 +110,10 @@ export default {
           name: 'openingAmount',
           type: 'sum',
           decimals: 2
+        },{
+          name: 'caseOverPayment',
+          type: 'sum',
+          decimals: 2
         }],
         column: [{
           label: '客户',
@@ -140,6 +144,10 @@ export default {
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
         },{
+          label: '使用溢付款',
+          prop: 'caseOverPayment',
+          overHidden: true,
+        },{
           label: '溢付款余额',
           prop: 'inOverpayment',
           overHidden: true,