lihongxiao 2 лет назад
Родитель
Сommit
7eeddf8230

+ 2 - 2
config/dev.env.js

@@ -9,12 +9,12 @@ module.exports = merge(prodEnv, {
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
-  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http://192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
-  // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
+  BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http://192.168.0.250:8080/"',//

+ 0 - 21
src/main.js

@@ -35,31 +35,12 @@ Vue.use(Viewer, {
 // 注册一个全局自定义指令 `v-watermark`
 Vue.directive('watermark', {
   inserted: function (el, binding) {
-    // 获取绑定的水印文字
-    // const text = binding.value || '水印';
-    // const canvas = document.createElement('canvas');
-    // const ctx = canvas.getContext('2d');
-    // canvas.width = 250;
-    // canvas.height = 200;
-    // ctx.font = '16px Arial';
-    // ctx.fillStyle = 'rgba(0, 0, 0, 0.2)';
-    // ctx.textAlign = 'center';
-    // ctx.textBaseline = 'middle';
-    // ctx.translate(canvas.width / 2, canvas.height / 2);
-    // ctx.rotate(-30*Math.PI/180);
-    // ctx.fillText(text,0,10);
-    // const base64 = canvas.toDataURL('image/png');
-    // el.style.backgroundImage = `url('${base64}')`;
-    // el.style.backgroundColor = '#fff';
-
-
     const watermarkText = binding.value || '默认水印';
     const canvas = document.createElement('canvas');
     const ctx = canvas.getContext('2d');
     canvas.width = 300;
     canvas.height = 250;
     ctx.fillStyle = 'rgba(180, 180, 180, 0.3)';
-    // ctx.fillRect(0, 0, canvas.width, canvas.height);
     ctx.font = '16px Arial';
     ctx.fillStyle = 'rgba(0, 0, 0, 0.2)';
     ctx.textAlign = 'center';
@@ -76,8 +57,6 @@ Vue.directive('watermark', {
     watermarkDiv.style.height = `${el.offsetHeight}px`;
     watermarkDiv.style.pointerEvents = 'none';
     watermarkDiv.style.backgroundImage = `url('${base64}')`;
-    // watermarkDiv.style.backgroundSize = '100% 100%';
-    // watermarkDiv.style.backgroundColor = 'rgba(255,255,255,0.1)';
     watermarkDiv.style.zIndex = '1000';
     el.appendChild(watermarkDiv);
   }

+ 7 - 7
src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -508,7 +508,7 @@
         </div>
         <el-button class="mrgin-1" size="small" type="warning" v-if="!tableRowForm.isExternal"
           @click="productCostFactorDialogVisible = true">产品费用因子</el-button>
-        <el-form ref="productCostForm" :model="productCostForm" label-width="130px" :size="overSize"
+        <el-form ref="productCostForm" :model="productCostForm" label-width="140px" :size="overSize"
           :rules="costformRules">
           <el-row>
             <el-col :span="20" :offset="2" v-if="productCostAddDialogType == 'edit'">
@@ -550,8 +550,8 @@
 
           <el-row v-if="productjqincludes">
             <h4 style="color: tomato">交强险费用</h4>
-            <el-col :span="5" :offset="1" v-if="!tableRowForm.isExternal">
-              <el-form-item label="费用比例" prop="jqCarCostsProportion">
+            <el-col :span="5" :offset="1" >
+              <el-form-item :label="tableRowForm.isExternal?'交强入口手续费比例 ':'费用比例'" prop="jqCarCostsProportion">
                 <el-input v-model="productCostForm.jqCarCostsProportion"
                   @blur="costRatioInput('jqCostsProportion', 'jqCarCostsProportion', 'jqCarOtherCostsProportion')"
                   placeholder="请输入费用比例"></el-input>
@@ -603,8 +603,8 @@
           <el-row v-if="productsyincludes">
             <h4 style="color: tomato">商业险费用</h4>
 
-            <el-col :span="5" :offset="1" v-if="!tableRowForm.isExternal">
-              <el-form-item label="费用比例" prop="syCarCostsProportion">
+            <el-col :span="5" :offset="1">
+              <el-form-item :label="tableRowForm.isExternal?'商业入口手续费比例 ':'费用比例'" prop="syCarCostsProportion">
                 <el-input v-model="productCostForm.syCarCostsProportion"
                   @blur="totalCostRatioInput('syCostsProportion', 'syCarCostsProportion', 'syCarOtherCostsProportion')"
                   placeholder="请输入费用比例"></el-input>
@@ -656,8 +656,8 @@
           </el-row>
           <el-row>
             <h4 style="color: tomato">非车费用</h4>
-            <el-col :span="5" :offset="1" v-if="!tableRowForm.isExternal">
-              <el-form-item label="费用比例" prop="noCarCostsProportion">
+            <el-col :span="5" :offset="1" >
+              <el-form-item :label="tableRowForm.isExternal?'非车入口手续费比例 ':'费用比例'" prop="noCarCostsProportion">
                 <el-input v-model="productCostForm.noCarCostsProportion"
                   @blur="totalCostRatioInput('noCostsProportion', 'noCarCostsProportion', 'noCarOtherCostsProportion')"
                   placeholder="请输入费用比例"></el-input>

+ 45 - 32
src/views/Task/daikeComponents/KtLetter.vue

@@ -708,44 +708,56 @@
           </div>
       </div>
       <el-form class="demo-ruleForm" :model="policyNumberForm" ref="policyNumberForm" :rules="rules"
-        label-width="160px" size="small" style="margin-top: 15px" label-position="top">
+        label-width="160px" size="small" style="margin-top: 15px">
         <el-row style="flex-wrap: wrap; display: flex;">
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="交强保单号" prop="jqpolicyno">
-              <el-input v-model="policyNumberForm.jqpolicyno" placeholder="请输入交强保单号" type="text"></el-input>
+              <el-input v-model="policyNumberForm.jqpolicyno" placeholder="请输入交强保单号"  ></el-input>
             </el-form-item>
           </el-col>
-          <el-col  :span="5" :offset="1">
+          <el-col  :span="8" >
+            <el-form-item label="交强险保费" prop="jqpremium">
+              <el-input v-model="policyNumberForm.jqpremium" placeholder="请输入交强险保费" type="text"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col  :span="8" >
+            <el-form-item label="交强险总比例" prop="jqCostsProportion">
+              <el-input v-model="policyNumberForm.jqCostsProportion" placeholder="请输入交强险其他费用比例" type="text"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col  :span="8" >
             <el-form-item label="商业保单号" prop="sypolicyno">
               <el-input v-model="policyNumberForm.sypolicyno" placeholder="请输入商业保单号" type="text"></el-input>
             </el-form-item>
           </el-col>
-          <el-col  :span="5" :offset="1">
-            <el-form-item label="驾意保单号" prop="jypolicyno">
-              <el-input v-model="policyNumberForm.jypolicyno" placeholder="请输入驾意保单号" type="text"></el-input>
+          
+          <el-col  :span="8" >
+            <el-form-item label="商业险保费" prop="sypremium">
+              <el-input v-model="policyNumberForm.sypremium" placeholder="请输入商业险保费" type="text"></el-input>
             </el-form-item>
           </el-col>
-          <el-col  :span="5" :offset="1">
-            <el-form-item label="交强险费用" prop="jqpremium">
-              <el-input v-model="policyNumberForm.jqpremium" placeholder="请输入交强险费用" type="text"></el-input>
+          <el-col  :span="8" >
+            <el-form-item label="商业险总比例" prop="syCostsProportion">
+              <el-input v-model="policyNumberForm.syCostsProportion" placeholder="请输入商业险其他费用比例" type="text"></el-input>
             </el-form-item>
           </el-col>
-          <el-col  :span="5" >
-            <el-form-item label="商业险费用" prop="sypremium">
-              <el-input v-model="policyNumberForm.sypremium" placeholder="请输入商业险费用" type="text"></el-input>
+          <el-col  :span="8" >
+            <el-form-item label="驾意保单号" prop="jypolicyno">
+              <el-input v-model="policyNumberForm.jypolicyno" placeholder="请输入驾意保单号" type="text"></el-input>
             </el-form-item>
           </el-col>
-          <el-col  :span="5" :offset="1">
-            <el-form-item label="驾意险费用" prop="jypremium">
-              <el-input v-model="policyNumberForm.jypremium" placeholder="请输入驾意险费用" type="text"></el-input>
+         
+          <el-col  :span="8" >
+            <el-form-item label="驾意险保费" prop="jypremium">
+              <el-input v-model="policyNumberForm.jypremium" placeholder="请输入驾意险保费" type="text"></el-input>
             </el-form-item>
           </el-col>
-          <el-col  :span="5" :offset="1">
-            <el-form-item label="车船税" prop="taxamount">
-              <el-input v-model="policyNumberForm.taxamount" placeholder="请输入车船税" type="text"></el-input>
+          <el-col  :span="8" >
+            <el-form-item label="非车险总比例" prop="noCostsProportion">
+              <el-input v-model="policyNumberForm.noCostsProportion" placeholder="请输入非车其他费用比例" type="text"></el-input>
             </el-form-item>
           </el-col>
-          <el-col  :span="5" :offset="1">
+          <!-- <el-col  :span="5" :offset="1">
             <el-form-item label="交强险手续费比例" prop="jqSuperviseCostsProportion">
               <el-input v-model="policyNumberForm.jqSuperviseCostsProportion" placeholder="请输入交强险手续费比例" type="text"></el-input>
             </el-form-item>
@@ -759,20 +771,21 @@
             <el-form-item label="非车手续费比例" prop="noSuperviseCostsProportion">
               <el-input v-model="policyNumberForm.noSuperviseCostsProportion" placeholder="请输入非车手续费比例" type="text"></el-input>
             </el-form-item>
-          </el-col>
-          <el-col  :span="5" :offset="1">
-            <el-form-item label="交强险其他费用比例" prop="jqOtherCostsProportion">
-              <el-input v-model="policyNumberForm.jqOtherCostsProportion" placeholder="请输入交强险其他费用比例" type="text"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col  :span="5" :offset="1">
-            <el-form-item label="商业险其他费用比例" prop="syOtherCostsProportion">
-              <el-input v-model="policyNumberForm.syOtherCostsProportion" placeholder="请输入商业险其他费用比例" type="text"></el-input>
+          </el-col> -->
+        
+          <el-col  :span="8" >
+            <el-form-item label="车船税" prop="taxamount">
+              <el-input v-model="policyNumberForm.taxamount" placeholder="请输入车船税" type="text"></el-input>
             </el-form-item>
           </el-col>
-          <el-col  :span="5" >
-            <el-form-item label="非车其他费用比例" prop="noOtherCostsProportion">
-              <el-input v-model="policyNumberForm.noOtherCostsProportion" placeholder="请输入非车其他费用比例" type="text"></el-input>
+          <el-col  :span="8" >
+            <el-form-item label="签单日期" prop="signDate">
+              <el-date-picker
+                v-model="policyNumberForm.signDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>