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

src/views/financialManagement/incomeInvoice/incomeInvoiceDetailsPage.vue

@@ -91,7 +91,8 @@
             </el-input>
           </template>
           <template slot="invoiceTitle">
-            <el-select v-model="form.invoiceTitle" size="small" placeholder="请选择 开票抬头" clearable filterable>
+            <el-select v-model="form.invoiceTitle" size="small" placeholder="请选择 开票抬头" clearable filterable
+              @change="invoiceChange">
               <el-option v-for="(item, index) in billingList" :key="index" :label="item.cname" :value="item.cname">
               </el-option>
             </el-select>
@@ -474,6 +475,19 @@ export default {
 
   },
   methods: {
+    invoiceChange(row) {
+      if (row) {
+        this.billingList.forEach(e => {
+          if (row == e.cname) {
+            this.form.bankNo = e.accountBank ? e.accountBank : '' + ':' + e.accountNo ? e.accountNo : ''
+            this.form.addressPhone = e.addr ? e.addr : '' + ';' + e.tel ? e.tel : ''
+          }
+        })
+      } else {
+        this.form.bankNo = ''
+        this.form.addressPhone = ''
+      }
+    },
     handleClick(tab) {
       if (tab.name === "first") {
         this.show = true

src/views/financialManagement/outputInvoice/outputInvoiceDetailsPage.vue

@@ -90,7 +90,8 @@
             </el-input>
           </template>
           <template slot="invoiceTitle">
-            <el-select v-model="form.invoiceTitle" size="small" placeholder="请选择 开票抬头" clearable filterable>
+            <el-select v-model="form.invoiceTitle" size="small" placeholder="请选择 开票抬头" clearable filterable
+              @change="invoiceChange">
               <el-option v-for="(item, index) in billingList" :key="index" :label="item.cname" :value="item.cname">
               </el-option>
             </el-select>
@@ -486,6 +487,19 @@ export default {
 
   },
   methods: {
+    invoiceChange(row) {
+      if (row) {
+        this.billingList.forEach(e => {
+          if (row == e.cname) {
+            this.form.bankNo = e.accountBank ? e.accountBank : '' + ':' + e.accountNo ? e.accountNo : ''
+            this.form.addressPhone = e.addr ? e.addr : '' + ';' + e.tel ? e.tel : ''
+          }
+        })
+      } else {
+        this.form.bankNo = ''
+        this.form.addressPhone = ''
+      }
+    },
     handleClick(tab) {
       if (tab.name === "first") {
         this.show = true

src/views/workManagement/main-items/detailsPage.vue

@@ -1128,18 +1128,17 @@ export default {
           this.detailsCollection()
           for (let i = 0; i < this.dataList.length; i++) {
             if (this.dataList[i].deptid === (null || "")) {
-              return this.$message.error(`请输入明细列表第${i + 1}行的任务部门`);
+              return this.$message.error(`请输入明细列表中的任务部门`);
             }
-            if (this.dataList[i].beginTime === (null || "")) {
-              return this.$message.error(`请输入明细列表第${i + 1}行的开始日期`);
+            if (this.dataList[i].beginTime === (null || "") && this.dataList[i].projectType != 0) {
+              return this.$message.error(`请输入明细列表中的开始日期`);
             }
-            if (this.dataList[i].actualDate === (null || "")) {
-              return this.$message.error(`请输入明细列表第${i + 1}行的结束`);
+            if (this.dataList[i].actualDate === (null || "") && this.dataList[i].projectType != 0) {
+              return this.$message.error(`请输入明细列表中的结束日期`);
             }
-            if (this.dataList[i].frequency === (null || "")) {
-              return this.$message.error(`请输入明细列表第${i + 1}行的频率`);
+            if (this.dataList[i].frequency === (null || "") && this.dataList[i].projectType == 0) {
+              return this.$message.error(`请输入明细列表中的频率`);
             }
-
           }
           this.buttonLoading = true
 

src/views/workManagement/receipt/configuration/settleAccountsDetailsADD.json

@@ -170,20 +170,6 @@
       "type": "date"
     },
     {
-      "label": "频率",
-      "prop": "frequency",
-      "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=frequency",
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "overHidden": true,
-      "index": 13,
-      "width": 100,
-      "cell": true
-    },
-    {
       "label": "提醒日",
       "prop": "reminderDay",
       "valueFormat": "yyyy-MM-dd HH:mm:ss",

src/views/workManagement/receipt/configuration/settleAccountsDetailsReturn.json

@@ -162,20 +162,6 @@
       "type": "date"
     },
     {
-      "label": "频率",
-      "prop": "frequency",
-      "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=frequency",
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "overHidden": true,
-      "index": 1,
-      "width": 100,
-      "cell": true
-    },
-    {
       "label": "提醒日",
       "prop": "reminderDay",
       "valueFormat": "yyyy-MM-dd HH:mm:ss",