Merge branch 'zz-test' into master

src/views/clw/gas/index.vue

@@ -83,6 +83,9 @@
         <span slot="gasCardType" slot-scope="text, record">
           <dict-tag :options="dict.type['gas_car_type']" :value="record.gasCardType" />
         </span>
+        <span slot="gasType" slot-scope="text, record">
+          <dict-tag :options="dict.type['gas_type']" :value="record.gasType" />
+        </span>
         <span slot="status" slot-scope="text, record">
           <dict-tag :options="dict.type['gas_status']" :value="record.status" />
         </span>
@@ -135,7 +138,7 @@ export default {
     ImportExcel
   },
   mixins: [tableMixin],
-  dicts: ['gas_car_type', 'gas_status'],
+  dicts: ['gas_car_type', 'gas_status','gas_type'],
   data() {
     return {
       list: [],
@@ -186,6 +189,7 @@ export default {
         {
           title: '油品',
           dataIndex: 'gasType',
+          scopedSlots: { customRender: 'gasType' },
           ellipsis: true,
           align: 'center',
         },

src/views/clw/gas/modules/CreateForm.vue

@@ -5,43 +5,69 @@
     </a-divider>
     <a-form-model ref="form" :model="form" :rules="rules">
       <a-form-model-item label="加油卡类型" prop="gasCardType">
-        <a-select placeholder="请选择加油卡类型" v-model="form.gasCardType" :disabled="formType==3">
+        <a-select
+          placeholder="请选择加油卡类型"
+          v-model="form.gasCardType"
+          :disabled="formType == 3"
+          @change="shangeCardType"
+        >
           <a-select-option v-for="(d, index) in gasCardTypeOptions" :key="index" :value="d.value">{{
             d.label
           }}</a-select-option>
         </a-select>
       </a-form-model-item>
-      <a-form-model-item label="车牌号" prop="carId">
-        <a-select placeholder="请选择加油卡类型" v-model="form.carId" @change="changeCarNum" :disabled="formType==3" showSearch :filterOption="filterOption">
-          <a-select-option v-for="(d, index) in Object.values(cacheCarPlateNumber)" :key="index" :value="d.id" >{{
+      <a-form-model-item label="车牌号" prop="carId" v-if="showInput == 2 || form.gasCardType == '2'">
+        <a-select
+          placeholder="请选择车牌号"
+          v-model="form.carId"
+          @change="changeCarNum"
+          :disabled="formType == 3"
+          showSearch
+          :filterOption="filterOption"
+        >
+          <a-select-option v-for="(d, index) in Object.values(cacheCarPlateNumber)" :key="index" :value="d.id">{{
             d.plateNumber
           }}</a-select-option>
         </a-select>
       </a-form-model-item>
-      <a-form-model-item label="机构名称" prop="deptName">
+      <a-form-model-item label="机构名称" prop="deptName"  v-if="showInput == 2 || form.gasCardType == '2'">
         <a-input v-model="form.deptName" placeholder="请输入机构名称" disabled />
       </a-form-model-item>
-      <a-form-model-item label="车辆分类" prop="carCategoryName">
+      <a-form-item label="机构名称" prop="deptId"  v-if="showInput == 1 || form.gasCardType == '1'">
+        <a-select placeholder="请选择" v-model="form.deptId" style="width: 100%" allow-clear @change="changeDept">
+          <a-select-option v-for="(d, index) in deptIdList" :key="index" :value="d.id">{{ d.lable }}</a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-model-item label="车辆分类" prop="carCategoryName" v-if="showInput == 2 || form.gasCardType == '2'">
         <a-input v-model="form.carCategoryName" placeholder="请输入车辆分类" disabled />
       </a-form-model-item>
       <a-form-model-item label="油品" prop="gasType">
-        <a-input v-model="form.gasType" placeholder="请输入油品" :disabled="formType==3" />
+        <!-- <a-input v-model="form.gasType" placeholder="请输入油品" :disabled="formType == 3" /> -->
+        <a-select
+          placeholder="请选择加油卡类型"
+          v-model="form.gasType"
+          :disabled="formType == 3"
+        >
+          <a-select-option v-for="(d, index) in dict.type['gas_type']" :key="index" :value="d.value">{{
+            d.label
+          }}</a-select-option>
+        </a-select>
       </a-form-model-item>
       <a-form-model-item label="油卡号" prop="gasCode">
-        <a-input v-model="form.gasCode" placeholder="请输入油卡号" :disabled="formType==3" />
+        <a-input v-model="form.gasCode" placeholder="请输入油卡号" :disabled="formType == 3" />
       </a-form-model-item>
       <a-form-model-item label="初始金额（元）" prop="initialAmount">
-        <a-input v-model="form.initialAmount" placeholder="请输入初始金额" :disabled="formType==3" />
+        <a-input v-model="form.initialAmount" placeholder="请输入初始金额" :disabled="formType == 3" />
       </a-form-model-item>
       <a-form-model-item label="状态" prop="status">
-        <a-select placeholder="请选择状态" v-model="form.status" :disabled="formType==3">
+        <a-select placeholder="请选择状态" v-model="form.status" :disabled="formType == 3">
           <a-select-option v-for="(d, index) in statusOptions" :key="index" :value="d.value">{{
             d.label
           }}</a-select-option>
         </a-select>
       </a-form-model-item>
       <a-form-model-item label="备注" prop="remark">
-        <a-input v-model="form.remark" placeholder="请输入内容" type="textarea" allow-clear :disabled="formType==3" />
+        <a-input v-model="form.remark" placeholder="请输入内容" type="textarea" allow-clear :disabled="formType == 3" />
       </a-form-model-item>
       <div class="bottom-control">
         <a-space>
@@ -51,13 +77,13 @@
       </div>
     </a-form-model>
   </a-drawer>
-
 </template>
 
 <script>
 import { getGas, addGas, updateGas, plateNumberList } from '@/api/clw/gas'
 export default {
   name: 'CreateForm',
+  dicts: ['gas_type'],
   props: {
     gasCardTypeOptions: {
       type: Array,
@@ -93,6 +119,36 @@ export default {
 
         remark: null,
       },
+      deptIdList: [
+        {
+          id: 100,
+          lable: '两江新区消防救援支队',
+        },
+        {
+          id: 173,
+          lable: '两江新区支队鸳鸯消防救援站',
+        },
+        {
+          id: 141,
+          lable: '两江新区支队翠云消防救援站',
+        },
+        {
+          id: 142,
+          lable: '两江新区支队龙头寺消防救援站',
+        },
+        {
+          id: 140,
+          lable: '两江新区支队大竹林特勤站',
+        },
+        {
+          id: 139,
+          lable: '两江新区支队礼嘉消防救援站',
+        },
+        {
+          id: 129,
+          lable: '两江新区支队奥园消防救援站',
+        },
+      ],
       // 1增加,2修改
       formType: 1,
       open: false,
@@ -114,6 +170,8 @@ export default {
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
       },
       cacheCarPlateNumber: {},
+      disabled: true,
+      showInput: '',
     }
   },
   filters: {},
@@ -168,12 +226,17 @@ export default {
       this.formType = 2
       const gasId = row ? row.gasId : ids
       getGas(gasId).then((response) => {
+        if (response.data.gasCardType == '2') {
+          this.disabled = true
+        } else if (response.data.gasCardType == '1') {
+          this.disabled = false
+        }
         this.form = response.data
         this.open = true
         this.formTitle = '修改'
       })
     },
-    handleInfo(row, ids){
+    handleInfo(row, ids) {
       this.formType = 3
       const gasId = row ? row.gasId : ids
       getGas(gasId).then((response) => {
@@ -229,18 +292,29 @@ export default {
       this.form.carCategoryName = node.categoryName
       this.form.plateNumber = node.plateNumber
     },
-    filterOption (value, option) {
+    filterOption(value, option) {
       return option.componentOptions.children[0].text.indexOf(value) >= 0
     },
-   
+    shangeCardType(val) {
+      this.showInput = val
+      if (val == 1) {
+        this.disabled = false
+      } else if (val == 2) {
+        this.disabled = false
+      }
+    },
+    changeDept(ev){  
+      let name=this.deptIdList[ev]
+      console.log(name);
+    }
   },
 }
 </script>
 <style lang="less" scoped>
-/deep/.ant-select{
+/deep/.ant-select {
   color: #000;
 }
-/deep/.ant-input{
+/deep/.ant-input {
   color: #000;
 }
 </style>

src/views/clw/oilSkimmingLog/index.vue

@@ -162,12 +162,12 @@ export default {
           ellipsis: true,
           align: 'center',
         },
-        {
-          title: '部门ID',
-          dataIndex: 'deptId',
-          ellipsis: true,
-          align: 'center',
-        },
+        // {
+        //   title: '部门ID',
+        //   dataIndex: 'deptId',
+        //   ellipsis: true,
+        //   align: 'center',
+        // },
         {
           title: '部门名称',
           dataIndex: 'deptName',

src/views/clw/records/modules/CreateForm.vue

@@ -26,13 +26,18 @@
         <a-col :span="10">
           <a-form-model-item label="提醒类型">
             <!-- :label="dict.label['remind_unit_type'][remindType]" -->
-            <a-input :value="dict.label['remind_type'][form.remindType]" placeholder="暂无信息" :disabled="formType == 3" disabled /> </a-form-model-item
+            <a-input
+              :value="dict.label['remind_type'][form.remindType]"
+              placeholder="暂无信息"
+              :disabled="formType == 3"
+              disabled
+            /> </a-form-model-item
         ></a-col>
       </a-row>
       <a-divider orientation="left">
         <b>申请详情</b>
       </a-divider>
-      <div v-if="form.remindType == 'USE_CAR_TIMEOUT'||form.remindType == 'RETURN_CAR'">
+      <div v-if="form.remindType == 'USE_CAR_TIMEOUT' || form.remindType == 'RETURN_CAR'">
         <a-row>
           <a-col :span="10">
             <a-form-model-item label="申请人">
@@ -110,13 +115,13 @@
             ><a-form-model-item label="状态">
               <a-input v-model="form.metaDetail.status" placeholder="暂无信息" disabled /> </a-form-model-item
           ></a-col>
-          <a-col :span="10"
-            ><a-form-model-item label="注销原因">
-              <a-input v-model="form.metaDetail.logoutReason" placeholder="暂无信息" disabled /> </a-form-model-item
-          ></a-col>
+          <a-col :span="10"></a-col>
         </a-row>
+        <a-form-model-item label="注销原因">
+          <a-input v-model="form.metaDetail.logoutReason" type="textarea" placeholder="暂无信息" disabled />
+        </a-form-model-item>
       </div>
-      <div v-if="form.remindType =='CHECK_YEAR'">
+      <div v-if="form.remindType == 'CHECK_YEAR'">
         <a-row>
           <a-col :span="10">
             <a-form-model-item label="经办人">
@@ -200,9 +205,15 @@
               /> </a-form-model-item
           ></a-col>
         </a-row>
-        <a-form-model-item label="驾驶证照片" >
-          <file-upload disabled v-model="warrantyImageId" type="image" module="register_bd" v-if="warrantyImageId"></file-upload>
-        <div class="imgs" v-else></div>
+        <a-form-model-item label="驾驶证照片">
+          <file-upload
+            disabled
+            v-model="warrantyImageId"
+            type="image"
+            module="register_bd"
+            v-if="warrantyImageId"
+          ></file-upload>
+          <div class="imgs" v-else></div>
         </a-form-model-item>
       </div>
       <!-- <a-form-model-item label="状态" prop="status">
@@ -323,25 +334,32 @@ export default {
       // this.formType = 3
       // const gasId = row ? row.gasId : ids
       getmsgInfo(row.id).then((response) => {
-        console.log('--------详情', response.data)
         this.form = response.data
-        if (response.data.metaDetail&&response.data.metaDetail.drivingLicense) {
+        if (response.data.metaDetail && response.data.metaDetail.drivingLicense) {
           this.warrantyImageId = '/api' + response.data.metaDetail.drivingLicense.drivingLicenseImageUrl
         }
-        if(response.data.metaDetail.isTimeout){
-          if(response.data.metaDetail.isTimeout=='0'){
-            this.form.metaDetail.isTimeout='未超期'
+        if (response.data.metaDetail.isTimeout) {
+          if (response.data.metaDetail.isTimeout == '0') {
+            this.form.metaDetail.isTimeout = '未超期'
           }
-          if(response.data.metaDetail.isTimeout=='1'){
-            this.form.metaDetail.isTimeout='已超期'
+          if (response.data.metaDetail.isTimeout == '1') {
+            this.form.metaDetail.isTimeout = '已超期'
           }
         }
-        if(response.data.metaDetail.isTips){
-          if(response.data.metaDetail.isTips=='0'){
-            this.form.metaDetail.isTips='超期未提醒'
+        if (response.data.metaDetail.isTips) {
+          if (response.data.metaDetail.isTips == '0') {
+            this.form.metaDetail.isTips = '超期未提醒'
           }
-          if(response.data.metaDetail.isTips=='1'){
-            this.form.metaDetail.isTips='超期已提醒'
+          if (response.data.metaDetail.isTips == '1') {
+            this.form.metaDetail.isTips = '超期已提醒'
+          }
+        }
+        if (response.data.metaDetail.status) {
+          if (response.data.metaDetail.status == '0') {
+            this.form.metaDetail.status = '注销'
+          }
+          if (response.data.metaDetail.status == '1') {
+            this.form.metaDetail.status = '正常'
           }
         }
         this.open = true
@@ -408,13 +426,13 @@ export default {
 /deep/.ant-input {
   color: #000;
 }
-.imgs{
-  width:130px;
-  height:130px;
-  background:url('../../../../assets/images/zwtp.png') no-repeat;
-  background-size:100% 100%;
+.imgs {
+  width: 130px;
+  height: 130px;
+  background: url('../../../../assets/images/zwtp.png') no-repeat;
+  background-size: 100% 100%;
 }
 /deep/.ant-col-10 {
-    margin-right: 40px;
-  }
+  margin-right: 40px;
+}
 </style>

src/views/clw/refuelingLog/index.vue

@@ -87,6 +87,9 @@
         <span slot="applyStatus" slot-scope="text, record">
           <dict-tag :options="dict.type['apply_status']" :value="record.applyStatus" />
         </span>
+        <span slot="gasType" slot-scope="text, record">
+          <dict-tag :options="dict.type['gas_type']" :value="record.gasType" />
+        </span>
         <span slot="operation" slot-scope="text, record">
           <!-- <a-divider type="vertical" v-hasPermi="['clw:refuelingLog:edit']" /> -->
           <a @click="$refs.createForm.handleUpdate(record, undefined)" v-hasPermi="['clw:refuelingLog:edit']">
@@ -125,7 +128,7 @@ export default {
     CreateForm,
   },
   mixins: [tableMixin],
-  dicts: ['apply_status'],
+  dicts: ['apply_status','gas_type'],
   data() {
     return {
       list: [],
@@ -199,6 +202,7 @@ export default {
         {
           title: '油品',
           dataIndex: 'gasType',
+          scopedSlots: { customRender: 'gasType' },
           ellipsis: true,
           align: 'center',
         },

src/views/clw/refuelingLog/modules/CreateForm.vue

@@ -43,7 +43,13 @@
         ></a-col>
         <a-col :span="10">
           <a-form-model-item label="油品" prop="gasType">
-            <a-input v-model="form.gasType" placeholder="暂无信息" :disabled="true" /> </a-form-model-item
+            <!-- <a-input v-model="form.gasType" placeholder="暂无信息" :disabled="true" /> -->
+            <a-select placeholder="请选择是否启用提醒" v-model="form.gasType" :disabled="formType == 3" disabled>
+          <a-select-option v-for="(d, index) in  dict.type['gas_type']" :key="index" :value="d.value" >{{
+            d.label
+          }}</a-select-option>
+        </a-select>
+             </a-form-model-item
         ></a-col>
       </a-row>
       <a-row>
@@ -136,7 +142,7 @@ export default {
       lineTitle:''
     }
   },
-  dicts: ['apply_status'],
+  dicts: ['apply_status','gas_type'],
   filters: {},
   created() {},
   computed: {},

src/views/clw/remind/modules/CreateForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-drawer width="35%" :label-col="4" :wrapper-col="14" :visible="open" @close="onClose">
+  <a-drawer width="40%" :label-col="4" :wrapper-col="14" :visible="open" @close="onClose">
     <a-divider orientation="left">
       <b>{{ formTitle }}</b>
     </a-divider>
@@ -30,8 +30,23 @@
       <a-form-model-item label="备注" prop="remark">
         <a-input v-model="form.remark" placeholder="请输入内容" type="textarea" allow-clear :disabled="formType == 3" />
       </a-form-model-item>
+  
       <a-form-model-item label="短信模板" prop="remindTemplate">
-        <a-input v-model="form.remindTemplate" placeholder="请输入短信内容" type="textarea" allow-clear :disabled="formType == 3" />
+        <span>
+          <a-tooltip>
+            <template slot="title"> 
+              <span>{{ dict.label['remind_template_params'][remindType] }}</span>
+            </template>
+            <span class="icon-img"><a-icon type="question-circle" /></span>
+          </a-tooltip>
+        </span>
+        <a-input
+          v-model="form.remindTemplate"
+          placeholder="请输入短信内容"
+          type="textarea"
+          allow-clear
+          :disabled="formType == 3"
+        />
       </a-form-model-item>
       <div class="bottom-control">
         <a-space>
@@ -49,7 +64,7 @@ import OpenCabinet from '../../KeyCase/modules/OpenCabinet.vue'
 
 export default {
   name: 'CreateForm',
-  dicts: ['remind_unit_type'],
+  dicts: ['remind_unit_type','remind_template_params'],
   props: {
     remindTypeOptions: {
       type: Array,
@@ -204,4 +219,10 @@ export default {
 /deep/.ant-input {
   color: #000;
 }
+.icon-img {
+  display: inline-block;
+position: absolute;
+top: -86px;
+left: 64px;
+}
 </style>

vue.config.js

@@ -110,8 +110,8 @@ const vueConfig = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://ruoyi.setworld.net`,
-        target: `http://113.249.153.164:7618/api`,
-        // target:`http://192.168.31.129:8080/`,
+        // target: `http://113.249.153.164:7618/api`,
+        target:`http://172.20.16.92:8080/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''