Merge remote-tracking branch 'origin/dev' into dev

src/views/financialManagementF/agreementprice/agreementpriceitems.vue

@@ -165,7 +165,7 @@
                                                   :clearable="true"
                                                   :remote="true"
                                                   :disabled="item.disabled"
-                                                  :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                  :forParameter="{key:'id',label:'balanceCycleType',value:'balanceCycleType'}"
                                                   @remoteMethod="balancecycleListfun" @corpChange="settlementPeriodCorpChange" >
                                         <balancecycle></balancecycle>
                                     </search-query>
@@ -372,7 +372,7 @@ export default {
                     {
                         label: "结算周期描述",
                         prop: "settlementPeriodDescr",
-                        disabled:true,
+                        // disabled:true,
                     },
                     {
                         label: "备注",
@@ -450,6 +450,13 @@ export default {
         },
         // 结算周期类型
         settlementPeriodCorpChange(value) {
+            for(let item of this.settlementPeriodData) {
+                if (item.balanceCycleType == value) {
+                    this.$set(this.agreementPriceForm,'settlementPeriodType',item.balanceCycleType)
+                    this.$set(this.agreementPriceForm,'settlementPeriodName',item.balanceCycleName)
+                    this.$set(this.agreementPriceForm,'settlementPeriodDescr',item.balanceCycleDescribe)
+                }
+            }
             console.log(value)
         },
         // 获取详情数据

src/views/financialManagementF/agreementprice/index.vue

@@ -127,6 +127,7 @@
             {
               label: "客户英文名称",
               prop: "corpEnName",
+                width:120,
               rules: [{
                 required: true,
                 message: "请输入客户英文名称",
@@ -145,31 +146,33 @@
             {
               label: "协议生效日期",
               prop: "effectiveDate",
+                width:120,
             },
             {
               label: "协议失效日期",
               prop: "expiringDate",
+                width:120,
 
             },
             {
               label: "人民币协议金额",
               prop: "amountCny",
-
+                width:120,
             },
             {
               label: "美元协议金额",
               prop: "amountUsd",
-
-            },
-            {
-              label: "协议签订人 Id",
-              prop: "signedId",
-
+                width:120,
             },
+            // {
+            //   label: "协议签订人 Id",
+            //   prop: "signedId",
+            //
+            // },
             {
               label: "协议签订人姓名",
               prop: "signedName",
-
+                width:120,
             },
             {
               label: "账期备注",
@@ -202,47 +205,17 @@
                 }],
             },
             {
-              label: "版本",
-              prop: "version",
-                hide:true,
-                display:false,
-            },
-            {
               label: "是否已删除（0 否 1是）",
               prop: "isDeleted",
                 hide:true,
                 display:false,
             },
               {
-                  label: "主键",
-                  prop: "id",
-                  hide:true,
-                  display:false,
-              },
-              {
-                  label: "分公司 Id",
-                  prop: "branchId",
-                  hide:true,
-                  display:false,
-              },
-              {
-                  label: "创建人 Id",
-                  prop: "createUser",
-                  hide:true,
-                  display:false,
-              },
-              {
                   label: "创建人",
                   prop: "createUserName",
                   display:false,
               },
               {
-                  label: "创建部门 Id",
-                  prop: "createDept",
-                  hide:true,
-                  display:false,
-              },
-              {
                   label: "创建部门",
                   prop: "createDeptName",
                   display:false,
@@ -250,12 +223,7 @@
               {
                   label: "创建时间",
                   prop: "createTime",
-                  display:false,
-              },
-              {
-                  label: "修改人 Id",
-                  prop: "updateUser",
-                  hide:true,
+                  width:160,
                   display:false,
               },
               {

src/views/financialManagementF/balancecycle/index.vue

@@ -27,7 +27,6 @@
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.balancecycle_delete"
                    @click="handleDelete">删 除
         </el-button>
       </template>
@@ -68,91 +67,12 @@ import {
           viewBtn: true,
           selection: true,
           dialogClickModal: false,
+            labelWidth:120,
           column: [
             {
-              label: "主键",
-              prop: "id",
-              rules: [{
-                required: true,
-                message: "请输入主键",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建人 Id",
-              prop: "createUser",
-              rules: [{
-                required: true,
-                message: "请输入创建人 Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建人",
-              prop: "createUserName",
-              rules: [{
-                required: true,
-                message: "请输入创建人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建部门 Id",
-              prop: "createDept",
-              rules: [{
-                required: true,
-                message: "请输入创建部门 Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建部门",
-              prop: "createDeptName",
-              rules: [{
-                required: true,
-                message: "请输入创建部门",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-              rules: [{
-                required: true,
-                message: "请输入创建时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改人 Id",
-              prop: "updateUser",
-              rules: [{
-                required: true,
-                message: "请输入修改人 Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改人",
-              prop: "updateUserName",
-              rules: [{
-                required: true,
-                message: "请输入修改人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改时间",
-              prop: "updateTime",
-              rules: [{
-                required: true,
-                message: "请输入修改时间",
-                trigger: "blur"
-              }]
-            },
-            {
               label: "结算周期类型",
               prop: "balanceCycleType",
+                search: true,
               rules: [{
                 required: true,
                 message: "请输入结算周期类型",
@@ -162,6 +82,7 @@ import {
             {
               label: "中文名称",
               prop: "balanceCycleName",
+                search: true,
               rules: [{
                 required: true,
                 message: "请输入中文名称",
@@ -171,6 +92,7 @@ import {
             {
               label: "结算周期描述",
               prop: "balanceCycleDescribe",
+                search: true,
               rules: [{
                 required: true,
                 message: "请输入结算周期描述",
@@ -178,41 +100,58 @@ import {
               }]
             },
             {
-              label: "版本",
-              prop: "version",
-              rules: [{
-                required: true,
-                message: "请输入版本",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "状态（0 正常 1停用）",
+              label: "状态",
               prop: "status",
-              rules: [{
-                required: true,
-                message: "请输入状态（0 正常 1停用）",
-                trigger: "blur"
-              }]
+                type:'select',
+                dicData:[{
+                    label:'启用',
+                    value:0
+                },{
+                    label:'停用',
+                    value:1
+                }],
+                value:0
             },
             {
               label: "是否已删除（0 否 1是）",
               prop: "isDeleted",
-              rules: [{
-                required: true,
-                message: "请输入是否已删除（0 否 1是）",
-                trigger: "blur"
-              }]
+                hide:true,
+                display:false,
             },
             {
               label: "备注",
               prop: "remarks",
-              rules: [{
-                required: true,
-                message: "请输入备注",
-                trigger: "blur"
-              }]
+                span:24,
+                type: 'textarea',
+                width: "180",
+                slot: true,
+                minRows: 3,
             },
+              {
+                  label: "创建人",
+                  prop: "createUserName",
+                  display:false,
+              },
+              {
+                  label: "创建部门",
+                  prop: "createDeptName",
+                  display:false,
+              },
+              {
+                  label: "创建时间",
+                  prop: "createTime",
+                  display:false,
+              },
+              {
+                  label: "修改人",
+                  prop: "updateUserName",
+                  display:false,
+              },
+              {
+                  label: "修改时间",
+                  prop: "updateTime",
+                  display:false,
+              },
           ]
         },
         data: []
@@ -222,10 +161,10 @@ import {
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.balancecycle_add, false),
-          viewBtn: this.vaildData(this.permission.balancecycle_view, false),
-          delBtn: this.vaildData(this.permission.balancecycle_delete, false),
-          editBtn: this.vaildData(this.permission.balancecycle_edit, false)
+          // addBtn: this.vaildData(this.permission.balancecycle_add, false),
+          // viewBtn: this.vaildData(this.permission.balancecycle_view, false),
+          // delBtn: this.vaildData(this.permission.balancecycle_delete, false),
+          // editBtn: this.vaildData(this.permission.balancecycle_edit, false)
         };
       },
       ids() {