二期bug修改

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/impl/TcProjectServiceImpl.java

@@ -691,12 +691,13 @@ public class TcProjectServiceImpl extends ServiceImpl<TcProjectMapper, TcProject
             equipment.setTotalPrice(
                 equipment.getAmount().multiply(BigDecimal.valueOf(equipment.getEquipmentQuantity())));
         }
-        boolean r = tcProjectEquipmentService.saveBatch(machineList);
-        if (!r) {
-            throw new ServiceException("设备信息保存失败");
+        if(!ObjectUtils.isEmpty(machineList)){
+            boolean r = tcProjectEquipmentService.saveBatch(machineList);
+            if (!r) {
+                throw new ServiceException("设备信息保存失败");
+            }
         }
 
-
         // 履历信息插入
         Long newVersion = tcProjectMapper.getNewVersion(tcProject.getProjectId());
         TcProjectHistory tcProjectHistory = new TcProjectHistory();

RuoYi-Vue-fast-master/src/main/resources/mybatis/business/quotation/TqQuotationMapper.xml

@@ -202,6 +202,7 @@
         <trim prefix="HAVING" prefixOverrides="AND">
             <if test="isGroupBy">
                 AND quo.id in (SELECT MAX(tq.id) as id FROM tq_quotation tq
+                LEFT JOIN sys_user u on tq.create_by = u.user_id
                 inner join (SELECT p.premession_char FROM (SELECT @premessionStr:= #{permissionChar} p) param ,
                 getpremessionview_chars p
                 ) permission on permission.premession_char = tq.permission_char
@@ -209,6 +210,18 @@
                     <if test="loginUserId != null  and loginUserId != ''">
                         and (tq.permission_char &lt;&gt; #{permission} or tq.create_by = #{loginUserId})
                     </if>
+                    <if test="beginTime != null and endTime != null">and tq.submit_time between #{beginTime} and #{endTime}
+                    </if>
+                    <if test="elevatorModel != null  and elevatorModel != ''">
+                        AND tq.elevator_model like concat('%',#{elevatorModel},'%')
+                    </if>
+                    <if test="nickName != null  and nickName != ''">and u.nick_name like concat('%',#{nickName},'%')</if>
+                    <if test="quotationStatus != null and quotationStatus.size() > 0">
+                        and  tq.quotation_status in
+                        <foreach item="item" collection="quotationStatus" open="(" separator="," close=")">
+                            #{item}
+                        </foreach>
+                    </if>
                 </where>
                 GROUP BY quotation_no)
             </if>

ruoyi-ui-vue2/src/views/board/projectFollow/index.vue

@@ -34,8 +34,13 @@
         >
           <el-table-column label="No" type="index" width="60"></el-table-column>
           <!-- 项目编号-->
-          <el-table-column :label="$t('project.no')" prop="projectNo" show-overflow-tooltip
-                           width="150"></el-table-column>
+          <Column :label="$t('project.no')" prop="projectNo"  width="200">
+            <template #default="{ row }">
+              <span @click="handleView(row)" class="link-type">{{ row.projectNo }}</span>
+            </template>
+          </Column>
+<!--          <el-table-column :label="$t('project.no')" prop="projectNo" show-overflow-tooltip-->
+<!--                           width="150"></el-table-column>-->
           <!--项目名称-->
           <el-table-column :label="$t('project.name')" prop="projectName" show-overflow-tooltip
                            width="200"></el-table-column>
@@ -195,6 +200,10 @@ export default {
 
 
   methods: {
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.$tab.openPage(this.$t('project.view'), '/project-view/' + row.projectId);
+    },
     getI18nDictName,
     getLocalTime,
     initChart() {

ruoyi-ui-vue2/src/views/crmManagement/project/index.vue

@@ -88,7 +88,7 @@
         <Column :label="$t('project.priceTotal')" prop="priceTotal" align="right">
           <template #default="{ row }">
             <!--保留两位小数-->
-            <span>{{ row.priceTotalStr }}</span>
+            <span>{{ row.priceTotalStr == '.00'?"-":row.priceTotalStr }}</span>
           </template>
         </Column>
 

ruoyi-ui-vue2/src/views/index.vue

@@ -75,7 +75,7 @@
             </Col>
 
             <!--报价-->
-            <Col :span="3" style="cursor: pointer" @click="handleComingClick(5)">
+            <Col :span="3" style="cursor: pointer"  v-has-permi="['business:quotation:list']" @click="handleComingClick(5)">
             <Row>
               <Col class="guideImage">
               <div class="guideInner" style="background-color:#F0F0FF;width: 66px;height: 66px">
@@ -88,7 +88,7 @@
             </Row>
             </Col>
             <!--土建出图-->
-            <Col :span="3" style="cursor: pointer" @click="handleComingClick(6)">
+            <Col :span="3" style="cursor: pointer"  v-has-permi="['civil:engineering:list']" @click="handleComingClick(6)">
             <Row>
               <Col class="guideImage">
               <div class="guideInner" style="background-color:#F0F0FF;width: 66px;height: 66px">
@@ -101,7 +101,7 @@
             </Row>
             </Col>
             <!--培训考核-->
-            <Col :span="3" style="cursor: pointer" @click="handleComingClick(7)">
+            <Col :span="3" style="cursor: pointer"  v-has-permi="['business:follow:list']" @click="handleComingClick(7)">
             <Row>
               <Col class="guideImage">
               <div class="guideInner" style="background-color:#F0F0FF;width: 66px;height: 66px">

ruoyi-ui-vue2/src/views/quotation/quotation.vue

@@ -154,8 +154,8 @@
     <el-dialog :title="$t('quotation.additionalCost')" :visible.sync="open" :close-on-click-modal="false" width="60%">
       <!--      <div class="card-title mb16">{{ $t('lead.baseInfo') }}</div>-->
       <!--      <div>-->
-      <el-form :model="form" label-width="100px">
-        <el-row>
+      <el-form :model="form" label-width="100px" label-position="top">
+        <el-row :gutter="24" >
           <el-col :span="12">
             <!--项目编号 -->
             <el-form-item :label="$t('project.projectNo')" prop="projectNo">
@@ -169,7 +169,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="24" >
           <el-col :span="12">
             <!--币种 -->
             <el-form-item :label="$t('project.currency')" prop="currency">
@@ -186,7 +186,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="24" >
           <el-col :span="12">
             <!--版本 -->
             <el-form-item :label="$t('common.version')" prop="accountName">