Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/components/Form/ProductCostForm.vue

@@ -112,6 +112,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <div v-if="formItems.attrType == 'select'" style="display: flex;">
                   <el-select multiple v-model="formItems.minArray" placeholder="请选择" style="width: 100%;"
                     @change="selectChange($event, formItems.id, 'min')">
@@ -190,6 +230,47 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
+
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -209,6 +290,7 @@
                   <el-button v-if="formItems.attrType == 'radio'" size="mini" style="margin-left: 20px;"
                     @click="radiouncheck(formItems)">取消选择</el-button>
                 </div>
+
               </el-form-item>
             </el-col>
           </div>
@@ -255,6 +337,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -320,6 +442,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -386,6 +548,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -451,6 +653,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -694,6 +936,10 @@ export default {
 }
 
 /deep/ {
+  .el-input--suffix .el-input__inner {
+    padding-right: 0 !important;
+  }
+
   .el-card__body {
     padding: 0;
   }

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -1400,21 +1400,21 @@
       </div>
     </el-dialog>
     <el-drawer
-   
+
     :visible.sync="drawer"
     :direction="'rtl'"
     size="85%"
     :before-close="handleClose"
-    >
-    
+    :destroy-on-close="true">
+
     <div class="drawer-main">
-      <agreementHistoryRecord :messageInfo="agreementActiveInfo" v-show="operationTypeBtn==1"/>
+      <agreementHistoryRecord :messageInfo="agreementActiveInfo" v-if="operationTypeBtn==1"/>
 
-      <agreementProductFee :messageInfo="agreementActiveInfo" v-show="operationTypeBtn==2"/>
+      <agreementProductFee :messageInfo="agreementActiveInfo" v-if="operationTypeBtn==2"/>
 
-      <agreementUnderwritingRule :messageInfo="agreementActiveInfo" v-show="operationTypeBtn==3"/>
+      <agreementUnderwritingRule :messageInfo="agreementActiveInfo" v-if="operationTypeBtn==3"/>
 
-      <agreementNonVehicleConfig :messageInfo="agreementActiveInfo" v-show="operationTypeBtn==4"/>
+      <agreementNonVehicleConfig :messageInfo="agreementActiveInfo" v-if="operationTypeBtn==4"/>
 
     </div>
   </el-drawer>
@@ -2817,6 +2817,7 @@ export default {
           obj.costsAttrLinkList.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -2852,6 +2853,7 @@ export default {
           obj.costsAttrLinkList.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -2889,6 +2891,7 @@ export default {
           data.map(ele => {
             switch (ele.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 ele.operator = '1';
                 break;
             }
@@ -3234,6 +3237,7 @@ export default {
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -3295,6 +3299,7 @@ export default {
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -3521,7 +3526,7 @@ export default {
       this.operType = "EDIT";
       this.dialogTitle = "协议编辑";
       this.productFilterList = []
-      
+
       this.$api.insCompany.agreementId(row.id).then((res) => {
         if (res.code == "200") {
           let scheme = res.data.scheme;

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -69,7 +69,7 @@
     </el-form>
     <div style="padding:0 10px 10px 10px ;" class=" flex j-s a-c">
       <span style="font-weight: bold;font-size: 15px;color: #242833;">
-        {{ lineData.agreementName }} - {{ lineData.businessDescription }} - {{ lineData.jobDescription }} - 
+        {{ lineData.agreementName }} - {{ lineData.businessDescription }} - {{ lineData.jobDescription }} -
         产品详情
       </span>
       <div class="flex a-c ">
@@ -1238,7 +1238,7 @@ export default {
   },
   // 生命周期函数
   created() {
-    console.log(this.messageInfo.isExternal, 888888);
+    console.log(this.messageInfo, 888888);
     this.lineData = this.messageInfo
     this.insuranceCompanyId = this.messageInfo.insuranceCompanyId;
     this.productpageRequest.agreementId = this.messageInfo.id;
@@ -1337,6 +1337,7 @@ export default {
           obj.costsAttrLinkList.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -1722,6 +1723,7 @@ export default {
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -1805,6 +1807,7 @@ export default {
           data.map(ele => {
             switch (ele.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 ele.operator = '1';
                 break;
             }

src/views/AgreementManage/CarInsurance/AgreementUnderwritingRule.vue

@@ -298,6 +298,7 @@ export default {
           obj.costsAttrLinkList.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -352,6 +353,7 @@ export default {
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -520,6 +522,7 @@ export default {
           data.map(ele => {
             switch (ele.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 ele.operator = '1';
                 break;
             }