Przeglądaj źródła

合同模块添加是否验收列和筛选条件

梁世豪 1 miesiąc temu
rodzic
commit
d23d5b7fbb

+ 0 - 1
src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -746,7 +746,6 @@
746 746
         WHERE
747 747
         b.SFBZ = 1
748 748
         AND b.SPZT = '审批结束'
749
-        AND (a.FYMC = '(1)外委研究支出费' OR a.FYMC = '(3)外协测试试验与加工费' OR a.FYMC = '(二)间接费')
750 749
         AND r.SPZT = '审批结束'
751 750
         AND b.BH != ''
752 751
         <if test="nys != null and nys !=''">

+ 3 - 0
src/main/resources/mapper/PrjContractDao.xml

@@ -255,6 +255,9 @@
255 255
         <if test="erpbh != null and erpbh != ''">
256 256
             and x.erpbh like '%'+#{erpbh}+'%'
257 257
         </if>
258
+        <if test="sfys != null and sfys != ''">
259
+            and c.sfys = #{sfys}
260
+        </if>
258 261
         <if test="spzt != null and  spzt != ''">
259 262
             and c.SPZT = #{spzt}
260 263
         </if>

+ 18 - 0
src/main/resources/templates/prjcontract/list.html

@@ -64,6 +64,16 @@
64 64
                                     </select>
65 65
                                 </div>
66 66
                             </div>
67
+                            <div class="layui-inline">
68
+                                <label class="layui-form-label" style="width: 60px">是否验收</label>
69
+                                <div class="layui-input-inline" style="width: 150px">
70
+                                    <select name="sfys" id="sfys" lay-filter="status">
71
+                                        <option value="">全部</option>
72
+                                        <option value='1'>已验收</option>
73
+                                        <option value='0'>未验收</option>
74
+                                    </select>
75
+                                </div>
76
+                            </div>
67 77
 
68 78
                             <div class="layui-inline" style="margin-left: 20px;">
69 79
                                 <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
@@ -191,6 +201,14 @@
191 201
                             return '0%';
192 202
                         }},
193 203
                     {field: 'htmc', width: '20%', title: '合同名称'},
204
+                    {field: 'sfys', width: '8%', title: '是否验收', align: 'center', templet: function (d) {
205
+                            if (1 == d.sfys) {
206
+                                return '<span class="layui-badge layui-bg-blue">是</span>';
207
+                            } else {
208
+                                return '<span class="layui-badge layui-bg-orange">否</span>';
209
+                            }
210
+                        }
211
+                    },
194 212
                     {field: 'zbpc', width: '8%', title: '招标批次'},
195 213
                     {field: 'zxdw', width: '8%', title: '中选单位'},
196 214
                     {field: 'sfsxtndw', width: '8%', title: '是否系统内单位', align: 'center', templet: function (d) {