apply-clients 3.2.50 → 3.2.53

package/src/components/product/Ledger/MaterialManagement/PurchaseRecords/PurchaseRecordsList.vue

@@ -5,25 +5,13 @@
         <div class="row">
           <div class="form-group col-sm-3">
             <label class="font_normal_body">编&emsp;&emsp;号：</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_ticket_number"
-                   v-on:keyup.enter="$parent.$parent.search()" condition="o.f_ticket_number like '%{}%'" placeholder='编号'>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_order_number"
+                   v-on:keyup.enter="$parent.$parent.search()" condition="po.f_order_number like '%{}%'" placeholder='编号'>
           </div>
           <div class="form-group col-sm-3">
-            <label class="font_normal_body">C&ensp;E&ensp;A号：</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_cea_number"
-                   v-on:keyup.enter="$parent.$parent.search()" condition="o.f_cea_number like '%{}%'" placeholder='CEA号'>
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">单据类型：</label>
-            <v-select
-              v-model="model.f_type"
-              placeholder='请选择'
-              condition="o.f_type like '%{}%'"
-              :value.sync="model.f_type"
-              :options='$parent.$parent.orderList'
-              class="select select_list"
-              :value-single="true"
-              close-on-select ></v-select>
+            <label class="font_normal_body">合同编号：</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_contract_number"
+                   v-on:keyup.enter="$parent.$parent.search()" condition="c.f_contract_number like '%{}%'" placeholder='合同编号'>
           </div>
           <div class="form-group col-sm-3 button-range">
             <export-excel :data="$parent.$parent.getCondition"
@@ -43,46 +31,6 @@
           </div>
         </div>
         <div class="row" v-show="$parent.$parent.criteriaShow">
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">项目类型：</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_type"
-                   v-on:keyup.enter="$parent.$parent.search()" condition="o.f_entry_type like '%{}%'" placeholder='项目类型'>
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">发料仓库：</label>
-            <input type="text" class="input_search" style="width: 60%" v-model="model.f_warehouse"
-                   v-on:keyup.enter="$parent.$parent.search()" condition="o.f_warehouse like '%{}%'" placeholder='发料仓库'>
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">施工单位：</label>
-            <input type="text" style="width: 60%" class="input_search" placeholder='施工单位' v-model="model.f_picking_unit"
-                   v-on:keyup.enter="$parent.$parent.search()"
-                   condition="o.f_picking_unit like '%{}%'">
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">工地名称：</label>
-            <input type="text" style="width: 60%" class="input_search" placeholder='工地名称' v-model="model.f_picking_site"
-                   v-on:keyup.enter="$parent.$parent.search()"
-                   condition="o.f_picking_site like '%{}%'">
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">操作人：</label>
-            <input type="text" style="width: 60%" class="input_search" placeholder='操作人' v-model="model.f_operator"
-                   v-on:keyup.enter="$parent.$parent.search()"
-                   condition="o.f_operator like '%{}%'">
-          </div>
-          <div class="form-group col-sm-3">
-            <label class="font_normal_body">状&emsp;&emsp;态：</label>
-            <v-select
-              v-model="model.f_outbound_status"
-              placeholder='请选择'
-              condition="{}"
-              :value.sync="model.f_outbound_status"
-              :options='$parent.$parent.OutboundStatus'
-              class="select select_list"
-              :value-single="true"
-              close-on-select ></v-select>
-          </div>
           <div class="form-group col-sm-3">
             <label  for="startDate" class="font_normal_body">开始时间：</label>
             <datepicker id="startDate" placeholder="开始日期"
@@ -91,7 +39,7 @@
                         :value.sync="model.startDate"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true"
-                        condition="o.f_billing_time >= '{}'">
+                        condition="po.f_invoicing_date >= '{}'">
             </datepicker>
           </div>
           <div class="form-group col-sm-3">
@@ -102,7 +50,7 @@
                         :value.sync="model.endDate"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true"
-                        condition="o.f_billing_time <= '{}'">
+                        condition="po.f_invoicing_date <= '{}'">
             </datepicker>
           </div>
         </div>
@@ -219,7 +167,9 @@ export default {
         'f_demand_date': '需求日期',
         'f_lump_sum': '开票金额',
         'f_actual_money': '实际金额',
-        'f_status': '状态'
+        'f_status': '状态',
+        'f_contract_time': '签订时间',
+        'f_contract_expiration_date': '到期时间'
       }
     }
   },

package/src/components/product/Ledger/MaterialManagement/WarehousingRecord/WarehousingRecordList.vue

@@ -112,7 +112,7 @@
       <template partial='head'>
         <tr>
           <th style="white-space: nowrap;">序号</th>
-<!--          <th style="white-space: nowrap;">物料编码</th>-->
+          <th style="white-space: nowrap;">物料编码</th>
           <th style="white-space: nowrap;">材料名称</th>
           <th style="white-space: nowrap;">材料型号</th>
           <th style="white-space: nowrap;">材料规格</th>
@@ -136,9 +136,9 @@
           <td style="text-align: center;">
             <nobr><font>{{$index+1}}</font></nobr>
           </td>
-<!--          <td style="text-align: center;">-->
-<!--            <nobr><font>{{row.f_material_coding}}</font></nobr>-->
-<!--          </td>-->
+          <td style="text-align: center;">
+            <nobr><font>{{row.f_material_coding}}</font></nobr>
+          </td>
           <td style="text-align: center;">
             <nobr><font>{{row.f_material_name}}</font></nobr>
           </td>

package/src/components/product/Ledger/Process/ProcessBusiness.vue

@@ -147,6 +147,14 @@
         this.$refs.query.$refs.cp.pager = true
         // 调用查询
         this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'comeback' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
       }
     },
     watch: {

package/src/components/product/Ledger/Process/ProcessSelect.vue

@@ -7,7 +7,7 @@
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">项目名称：</label>
                 <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="u.f_entry_name like '%{}%'" placeholder='项目名称'>
+                       v-on:keyup.enter="$parent.$parent.search()" placeholder='项目名称'  condition="CHARINDEX('{}',u.f_entry_name)>0">
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">工程编号：</label>
@@ -26,6 +26,7 @@
                         v-if="this.$login.f.f_role_name.includes('信息录入')"
                         @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
                 <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+                <button class="button_search button_spacing" @click="$parent.$parent.comeback()" v-el:cx>返回</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
                 <div
                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -90,6 +91,18 @@
                        style="width: 60%"
                        condition="u.f_address like '%{}%'">
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">是否填写过交底时间</label>
+                <v-select
+                  v-model="model.isnull"
+                  placeholder='项目区域'
+                  condition="u.f_confess_time is not null and u.f_confess_time !='' and defname='工程前期' and f_apply_type='客户项目'"
+                  :value.sync="model.isnull"
+                  :options='$parent.$parent.isnull'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </div>
             </div>
           </div>
       </criteria>
@@ -111,41 +124,41 @@
           </tr>
         </template>
         <template partial='body'>
-          <tr >
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+          <tr>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{$index+1}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_entry_name}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_project_number}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_project_type}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_project_area}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_contact}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_phone}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_cea_number}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.defname}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_address}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <dropdown>
                 <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
                   <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
@@ -202,6 +215,7 @@
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目类型')], // 所有报建类型
         projectTypes: [{label: '全部', value: ''},...this.$appdata.getParam('工程类型')],
         projectAreas: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目区域')], // 所有报建类型
+        isnull: [{label:'有',value: '有'}],
         defnames: [{label: '全部', value: ''}], // 流程节点
         model: new PagedList('rs/sql/checkuser', 20, {
           data: {
@@ -231,6 +245,9 @@
       search () {
         this.$dispatch('search')
       },
+      comeback(){
+        this.$dispatch('comeback')
+      },
       // 根据项目类型获取对应的流程节点
       applyTypeChange () {
         if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
@@ -334,6 +351,14 @@
     color: #dc0b12;
     font-weight:bold
   }
+  .you {
+    color: #a94442;
+    font-weight:bold
+  }
+  .wu {
+    color: #222222;
+    font-weight:bold
+  }
   .p {
     color: #ffaf4f;
   }