协议产品修改字段

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -106,6 +106,14 @@
               <el-input :size="overSize" clearable v-model.trim="queryForm.dockingPerson" placeholder="请输入对接人"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否有效">
+              <el-select :size="overSize" v-model="queryForm.isValid" placeholder="请选择" clearable style="width: 100%">
+                <el-option label="有效" :value="1"></el-option>
+                <el-option label="无效" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div style="font-weight: bold;font-size: 15px;color: #242833;" class="p-1 flex j-s a-c">
@@ -352,6 +360,26 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="选择机构">
+                    <el-select v-model="custodianIdData" placeholder="请选择对接管理人机构" :popper-append-to-body="false" style="width: 100%">
+                      <el-option :value="custodianIdTree" class="deptOption">
+                        <el-tree :data="internalDept" :props="defaultProps" ref="tree1" :highlight-current="true"
+                          @node-click="handleNodeClick1" default-expand-all></el-tree>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="对接管理人">
+                    <el-select v-model="agreement.custodianId" filterable clearable placeholder="请选择对接管理人" style="width: 100%">
+                      <el-option v-for="item in custodianList" :key="item.dictValue" :label="item.name"
+                        :value="item.userId"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="含增值税结算" prop="withTax">
@@ -504,7 +532,7 @@
       </el-tabs>
       <!-- 底部区域 -->
       <span slot="footer" class="dialog-footer">
-        <el-button :size="overSize" @click="agreementdialogVisible = false">取 消</el-button>
+        <el-button :size="overSize" @click="closeSubmit">取 消</el-button>
         <el-button :size="overSize" v-show="agreement.agreestatus != '0'" type="primary"
           style="background: #2D4D89;color: #fff;border-color: #2D4D89;" @click="submitForm">提交</el-button>
       </span>
@@ -1363,7 +1391,7 @@
         <el-steps direction="vertical" :active="trajectoryTable1.length - 1">
           <el-step :title="item.readme" :key="item.id" v-for="item in trajectoryTable1">
             <template slot="description">
-              <span>提交人：{{ item.createBy }}</span>
+              <span>提交人：{{ item.createName }}</span>
               <div style="margin-bottom: 20px;">创建时间：{{ item.createTime }}</div>
             </template>
           </el-step>
@@ -2009,6 +2037,7 @@ export default {
         cooperationChannels: "", //合作渠道
         dockingPerson: "", //对接人
         dockingPhone: "", //联系方式（对接人）
+        custodianId: '',
         endDate: "", //协议止期
         fileId: "", //	附件id
         insuranceCompanyId: "", //保险公司id
@@ -2366,6 +2395,9 @@ export default {
       showTrajectoryDialog: false,    // 协议轨迹
       ddgjdialogVisible1: false,
       trajectoryTable1: [],
+      custodianIdData: '',
+      custodianIdTree: '',
+      custodianList: [],
     };
   },
   computed: {
@@ -2463,7 +2495,7 @@ export default {
     this.defaultattributionform = JSON.parse(
       JSON.stringify(this.attributionform)
     );
-
+    this.getCustodianList()
   },
   mounted() {
     // this.labelWidth = "auto";
@@ -2530,6 +2562,18 @@ export default {
     agreementCurrentChange(val) {
       this.agreementActiveInfo = val;
     },
+    handleNodeClick1(data, self, child) {
+      this.custodianIdData = data.name;//展示部分
+      this.getCustodianList(data.id)
+    },
+    getCustodianList(id) {
+      this.$api.user.findBackUserList1({
+        deptId: id,
+        agentFlag: 0
+      }).then((res) => {
+        this.custodianList = res.data
+      })
+    },
     handleNodeClick(data, self, child) {
       this.labelData = data.name;//展示部分
       this.agreement.deptId = data.id
@@ -3921,6 +3965,12 @@ export default {
         this.agreement.agreementType = "2";
       }
     },
+    // 关闭提交
+    closeSubmit() {
+      this.agreementdialogVisible = false
+      this.agreement.custodianId = ''
+      this.custodianIdData = ''
+    },
     //提交
     submitForm() {
       let agreementCheckFlag = true; //协议信息校验标志

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -44,6 +44,13 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建日期">
+            <el-date-picker style="width: 100%;" v-model="createDate" type="daterange" value-format="yyyy-MM-dd"
+              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="costsEndDateChange1">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="费用描述">
             <el-select style="width: 100%;"  v-model="productpageRequest.costsDescription" multiple filterable allow-create default-first-option
@@ -604,7 +611,7 @@
             <el-col :span="12">
               <el-form-item label="费用起期：">
                 <el-date-picker size="small"  v-model="batchUpdateForm1.costsStartDate" type="datetime"
-                  placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss">
+                  placeholder="选择开始日期" value-format="yyyy-MM-dd HH:mm:ss">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -640,6 +647,7 @@ export default {
   data() {
     return {
       productDate: [],
+      createDate: [],
       productcopyDate: [],
       protocolpageResult: [],
       productcopyItemResult: [],//协议费用列表
@@ -1734,6 +1742,16 @@ export default {
       this.productpageRequest.costStartDate = e[0];
       this.productpageRequest.costsEndDate = e[1];
     },
+    costsEndDateChange1(e) {
+      if (e) {
+        this.productpageRequest.createStartTime = e[0];
+        this.productpageRequest.createEndTime = e[1];
+      } else {
+        this.productpageRequest.createStartTime = '';
+        this.productpageRequest.createEndTime = '';
+      }
+    },
+    
     //产品分页json
     productCostFindPage(data) {
       if (data && data.pageRequest) {

src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -12,7 +12,8 @@
 
       <el-form-item label="协议选择">
         <el-select size="small" multiple clearable collapse-tags filterable v-model="productpageRequest.agreementIdList" :placeholder="'请输入'">
-          <el-option v-for="(s, i) in agreementList" :key="i" :label="s.agreementName" :value="s.id"></el-option>
+          <el-option v-for="(s, i) in agreementList" :key="i" 
+          :label="s.agreementTitle + '-' + (s.businessDescription || ' ') + '-' + (s.jobDescription || '  ')" :value="s.id"></el-option>
         </el-select>
       </el-form-item>