Pārlūkot izejas kodu

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

lihongxiao 2 gadi atpakaļ
vecāks
revīzija
3aa8065891

BIN
src/assets/qiyeweixin.png


+ 2 - 2
src/http/moudules/insCompany.js

@@ -218,9 +218,9 @@ export const agreementPage = (data) => {
     data
   })
 }
-export const getAllAgreement = () => {
+export const getAllAgreement = (id) => {
   return axios({
-    url: '/plt/agreement/getAllAgreement  ',
+    url: '/plt/agreement/getAllAgreement?agreementId='+id,
     method: "get",
   })
 }

+ 3 - 5
src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -72,7 +72,7 @@
         <el-button class="ktbuttonactive" size="small" :style="ktbuttonStyle" @click="productHistory">历史记录</el-button>
       </div>
     </div>
-    <kt-common-table :tableHeights="610" :SerialShow="false" :operationWidth="250" :showOperation="true"
+    <kt-common-table :tableHeights="580" :SerialShow="false" :operationWidth="250" :showOperation="true"
       :showBatchDelete="true" :showBatchSettled="false" :showBatchPrint="false" :customToolseletted="true"
       :data="productPageResult" :columns="productColumns" @findPage="productCostFindPage" button2Name="编辑"
       button2Type="text" button3Type="text" button5Type="text" :button2style="{ color: '#2D4D89' }"
@@ -395,7 +395,7 @@
           label-width="80px">
           <el-form-item label="选择协议">
             <el-select v-model="productcopyItemPageRequest.agreementId" placeholder="请选择协议">
-              <el-option v-for="(item, index) in protocolpageResult" :key="index" :label="item.agreementAbbreviation"
+              <el-option v-for="(item, index) in protocolpageResult" :key="index" :label="item.agreementName"
                 :value="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -1034,8 +1034,6 @@ export default {
   // 生命周期函数
   created() {
     this.insuranceCompanyId = this.$route.query.insuranceCompanyId;
-    console.log( this.insuranceCompanyId,222222222111111111);
-
     this.productpageRequest.agreementId = this.$route.query.id;
     this.productCostForm.agreementId = this.$route.query.id;
     this.licenseQuery();
@@ -1051,7 +1049,7 @@ export default {
     this.$api.insCompany.shutdown().then((res) => {
       this.permissions = res.data;
     });
-    this.$api.insCompany.getAllAgreement().then((res) => {
+    this.$api.insCompany.getAllAgreement( this.productpageRequest.agreementId).then((res) => {
       if (res.code == 200) {
         this.protocolpageResult = res.data;
       } else {

+ 2 - 1
src/views/Task/daikeComponents/KtOrder.vue

@@ -543,7 +543,7 @@ export default {
     this.getDicType("businessVehicleUse"); //(车辆用途)营业
     this.getDicType("outOfBusinessVehicleUse"); //(车辆用途)非营业
     this.getDicType("productsType"); //(车辆用途)非营业
-    
+
     this.$api.letter.gainTopList().then(res => {
       this.companyList = res.data;
     });
@@ -799,6 +799,7 @@ export default {
         大家财险: "updateOrderInfoDajia",
         中煤财险: "orderStatuszhongmei",
         太平财险: "auditStatusQuery",
+        泰康财险: "auditStatusQuery",
         华农财险: "auditStatusQuery",
         恒邦财险: "auditStatusQuery",
         众安财险: "auditStatusQuery",

+ 169 - 0
src/views/Work/WorkList.vue

@@ -0,0 +1,169 @@
+<template>
+  <div class="InvoicedAndSettled" style="width: 99%; margin-top: 0px">
+    <templateTable ref="templateTable" :tableConfig="tableConfig" :data="tableData"
+     :btnGroup="btnGroup" :formList="formList" @handleSearchList="handleSearchList"
+      @findPage="findPage" @getList="findPage" :pagination="pageData">
+    </templateTable>
+
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="50%" :before-close="handleClose">
+      <el-form ref="form" :model="formAdd" label-width="130px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="项目名称">
+              <el-input v-model="formAdd.projectName" class="inputType"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目类型">
+              <el-select v-model="formAdd.projectType" placeholder="请选择">
+                <el-option label="产品型项目" value="1"></el-option>
+                <el-option label="项目型项目" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目描述">
+              <el-input v-model="formAdd.projectDesc" class="inputType"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import templateTable from '@/components/TemplateTable/index.vue'
+export default {
+  components: {
+    templateTable
+  },
+  data() {
+    return {
+      tableData:[],
+      tableConfig: {
+        columns: [
+          { prop: "projectName", label: "项目名称", type: "text"},
+          { prop: "projectDesc", label: "项目描述", type: "text" },
+          { prop: "projectType", label: "项目类型", type: "statMap", options:[{ label: "产品型项目 ", value: "1", }, { label: "项目型项目", value: "2", }]},
+          { prop: "creator", label: "创建人", type: "text" },
+          { prop: "createTime", label: "创建时间", type: "text" },
+        ],
+        isPaginationShow:true,
+        loading: true,
+        tableHeight: 'auto',
+        optBtns:[
+          { type:'primary', label:'编辑', click:(row, index) => {return this.haldUpload(row)}},
+          { type:'primary', label:'删除', click:(row, index) => {return this.haldDelete(row)}},
+        ]
+      },
+      pageData: { pageNum: 1, pageSize: 20},
+      btnGroup: [
+        { name:'新增', click:() => {return this.newAdd()}, },
+      ],
+      formList: [
+        { label: "项目名称", prop: "projectName", type: "input", },
+        { prop: "projectType", label: "项目类型", type: "select", options:[{ label: "产品型项目 ", value: "1", }, { label: "项目型项目", value: "2", }]},
+      ],
+      dialogVisible: false,
+      formAdd: {},
+      dialogTitle: '新增',
+    }
+  },
+  created() {
+    this.findPage();
+  },
+  methods: {
+    findPage(data) {
+      this.$api.task.selectProject({...this.pageData, ...data}).then((res) => {
+        if (res.code == 200) {
+          this.tableData = res.data.records
+          this.pageData.pageNum = res.data.current
+          this.pageData.pageSize = res.data.size
+          this.pageData.totalSize = res.data.total
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.tableConfig.loading = false;
+      })
+    },
+    handleSearchList(data) {
+      this.findPage(data);
+    },
+    addSubmit() {
+      console.log(this.formAdd)
+      if (this.dialogTitle == '新增') {
+        this.$api.task.addProject(this.formAdd).then((res) => {
+          if (res.code == 200) {
+            this.$message.success(res.msg)
+            this.findPage()
+            this.handleClose()
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      } else {
+          this.$api.task.updateProject(this.formAdd).then((res) => {
+          if (res.code == 200) {
+            this.$message.success(res.msg)
+            this.findPage()
+            this.handleClose()
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }
+      
+    },
+    newAdd() {
+      this.dialogTitle = '新增'
+      this.dialogVisible = true
+    },
+    haldUpload(row) {
+      this.dialogTitle = '编辑'
+      this.dialogVisible = true
+      this.formAdd = {
+        projectName: row.projectName,
+        projectType: row.projectType,
+        projectDesc: row.projectDesc,
+        id: row.id
+      }
+    },
+    haldDelete(row) {
+      this.$confirm('确认是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$api.task.removeProject({
+          id: row.id
+        }).then((res) => {
+          if (res.code == 200) {
+            this.$message.success(res.msg)
+            this.findPage()
+          }
+        })
+      }).catch(() => {
+        this.$message.error('已取消删除')
+      });
+    },
+    handleClose() {
+      this.dialogVisible = false
+      this.formAdd = {
+        projectType: ''
+      }
+    },
+  }
+}
+</script>
+    
+<style scoped lang="scss">
+  .InvoicedAndSettled>>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+  }
+</style>