优化采购申请

WebService/src/main/resources/components/purchaseApplyPackage/add-purchaseApply/addPurchaseApply.html

@@ -3,48 +3,25 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">添加采购申请</h3>
+                <h3 class="m-t-none m-b ">采购申请</h3>
                 <div class="ibox-content">
                     <div>
                         <div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">使用人</label>
-                                <div class="col-sm-3">
-                                    <vc:create name="orgSelect2"
-                                               parentModal="addInspectionPlanModel"
-                                               callBackListener="addInspectionPlanInfo"
-                                               callBackFunction="notify"
-                                               namespace="addInspectionPlan"
-                                    ></vc:create>
-                                </div>
-                                <div class="col-sm-3">
-                                    <vc:create name="departmentSelect2"
-                                               parentModal="addInspectionPlanModel"
-                                               callBackListener="addInspectionPlanInfo"
-                                               callBackFunction="notify"
-                                               namespace="addInspectionPlan"
-                                    ></vc:create>
-                                </div>
-                                <div class="col-sm-3">
-                                    <vc:create name="staffSelect2"
-                                               parentModal="addInspectionPlanModel"
-                                               callBackListener="addInspectionPlanInfo"
-                                               callBackFunction="notify"
-                                               namespace="addInspectionPlan"
-                                    ></vc:create>
-                                </div>
-                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">申请说明</label>
                                 <div class="col-sm-10">
-                                    <textarea v-model="addPurchaseApplyInfo.description" type="text" placeholder="选填，请填写申请说明"
+                                    <textarea v-model="addPurchaseApplyInfo.description" type="text" placeholder="请填写申请说明"
                                               class="form-control">
                                     </textarea>
                                 </div>
                             </div>
-
-
                             <ul class="nav nav-list"><li class="divider"></li></ul>
+                            <div class="btn-group-sm" id="toolbar" role="group">
+                                <a class="btn btn-success" v-on:click="openResourceStoreTableModel()"><i class="fa fa-plus"></i>选择物品</a>
+                                <a class="btn btn-danger">
+                                    <i class="fa fa-remove"></i>移除
+                                </a>
+                            </div>
                             <table id="resource_table"></table>
 
                             <div class="ibox-content">

WebService/src/main/resources/components/purchaseApplyPackage/add-purchaseApply/addPurchaseApply.js

@@ -1,63 +1,61 @@
-(function(vc){
+(function (vc) {
 
     vc.extends({
         propTypes: {
-               callBackListener:vc.propTypes.string, //父组件名称
-               callBackFunction:vc.propTypes.string //父组件监听方法
+            callBackListener: vc.propTypes.string, //父组件名称
+            callBackFunction: vc.propTypes.string //父组件监听方法
         },
-        data:{
-            addPurchaseApplyInfo:{
-                applyOrderId:'',
-                state:'',
-                description:''
+        data: {
+            addPurchaseApplyInfo: {
+                applyOrderId: '',
+                state: '',
+                description: ''
 
             }
         },
-         _initMethod:function(){
+        _initMethod: function () {
             //初始化物品表格
-             vc.component.initResourceTable();
-         },
-         _initEvent:function(){
-            vc.on('addPurchaseApply','openAddPurchaseApplyModal',function(){
+            //vc.component.initResourceTable();
+        },
+        _initEvent: function () {
+            vc.on('addPurchaseApply', 'openAddPurchaseApplyModal', function () {
                 $('#addPurchaseApplyModel').modal('show');
             });
         },
-        methods:{
-            addPurchaseApplyValidate(){
+        methods: {
+            addPurchaseApplyValidate() {
                 return vc.validate.validate({
-                    addPurchaseApplyInfo:vc.component.addPurchaseApplyInfo
-                },{
-                    'addPurchaseApplyInfo.state':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"订单状态不能为空"
+                    addPurchaseApplyInfo: vc.component.addPurchaseApplyInfo
+                }, {
+                    'addPurchaseApplyInfo.state': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "订单状态不能为空"
                         },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"计算公式格式错误"
+                        {
+                            limit: "num",
+                            param: "",
+                            errInfo: "计算公式格式错误"
                         },
                     ],
 
 
-
-
                 });
             },
-            savePurchaseApplyInfo:function(){
-                if(!vc.component.addPurchaseApplyValidate()){
+            savePurchaseApplyInfo: function () {
+                if (!vc.component.addPurchaseApplyValidate()) {
                     vc.toast(vc.validate.errInfo);
 
-                    return ;
+                    return;
                 }
 
                 vc.component.addPurchaseApplyInfo.communityId = vc.getCurrentCommunity().communityId;
                 //不提交数据将数据 回调给侦听处理
-                if(vc.notNull($props.callBackListener)){
-                    vc.emit($props.callBackListener,$props.callBackFunction,vc.component.addPurchaseApplyInfo);
+                if (vc.notNull($props.callBackListener)) {
+                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addPurchaseApplyInfo);
                     $('#addPurchaseApplyModel').modal('hide');
-                    return ;
+                    return;
                 }
 
                 vc.http.post(
@@ -65,64 +63,68 @@
                     'save',
                     JSON.stringify(vc.component.addPurchaseApplyInfo),
                     {
-                        emulateJSON:true
-                     },
-                     function(json,res){
+                        emulateJSON: true
+                    },
+                    function (json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if(res.status == 200){
+                        if (res.status == 200) {
                             //关闭model
                             $('#addPurchaseApplyModel').modal('hide');
                             vc.component.clearAddPurchaseApplyInfo();
-                            vc.emit('purchaseApplyManage','listPurchaseApply',{});
+                            vc.emit('purchaseApplyManage', 'listPurchaseApply', {});
 
-                            return ;
+                            return;
                         }
                         vc.message(json);
 
-                     },
-                     function(errInfo,error){
+                    },
+                    function (errInfo, error) {
                         console.log('请求失败处理');
 
                         vc.message(errInfo);
 
-                     });
+                    });
             },
-            clearAddPurchaseApplyInfo:function(){
+            clearAddPurchaseApplyInfo: function () {
                 vc.component.addPurchaseApplyInfo = {
-                    state:'',
+                    state: '',
                 };
             },
             //初始化表格
-            initResourceTable:function(){
+            initResourceTable: function () {
                 $('#resource_table').bootstrapTable({
-                    height: 500,
+                    height: 350,
+                    toolbar: '#toolbar',
                     columns: [
                         {
-                            field:'resId',
-                            title:'资源ID',
+                            field: 'resId',
+                            title: '资源ID',
                         },
                         {
-                            field:'resName',
-                            title:'资源名称',
-                        },{
-                            field:'resCode',
-                            title:'物品编码',
-                        },{
-                            field:'price',
-                            title:'单价',
-                        },{
-                            field:'stock',
-                            title:'库存'
-                        },{
-                            field:'quantity',
-                            title:'采购数量'
+                            field: 'resName',
+                            title: '资源名称',
+                        }, {
+                            field: 'resCode',
+                            title: '物品编码',
+                        }, {
+                            field: 'price',
+                            title: '单价',
+                        }, {
+                            field: 'stock',
+                            title: '库存'
+                        }, {
+                            field: 'quantity',
+                            title: '采购数量'
                         },
                         {
-                            field:'remark',
-                            title:'备注'
+                            field: 'remark',
+                            title: '备注'
                         }
                     ],
                 });
+            },
+            openResourceStoreTableModel:function () {
+                vc.emit('resourceStoreTable','openResourceStoreTableModal',null);
             }
         }
     });

WebService/src/main/resources/components/purchaseApplyPackage/addFileView/addFileView.html

@@ -0,0 +1,22 @@
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox">
+            <div class="ibox-title">
+                <h5>上传附件</h5>
+                <div class="ibox-tools" style="top:10px;"></div>
+            </div>
+            <div class="ibox-content">
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">附件</label>
+                    <div class="content-img col-sm-10">
+                        <vc:create name="uploadImage"
+                                   callBackListener="addAdvert"
+                                   callBackFunction="notifyUploadVedio"
+                                   namespace="addAdvert"
+                        ></vc:create>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/purchaseApplyPackage/addFileView/addFileView.js

@@ -0,0 +1,101 @@
+(function (vc) {
+
+    vc.extends({
+        propTypes: {
+            callBackListener: vc.propTypes.string, //父组件名称
+            callBackFunction: vc.propTypes.string //父组件监听方法
+        },
+        data: {
+            addComplainViewInfo: {
+                flowComponent: 'addComplainView',
+                typeCd: '',
+                complaintName: '',
+                tel: '',
+                context: '',
+
+            }
+        },
+        watch: {
+            addComplainViewInfo: {
+                deep: true,
+                handler: function () {
+                    vc.component.saveAddComplainInfo();
+                }
+            }
+        },
+        _initMethod: function () {
+
+        },
+        _initEvent: function () {
+
+            vc.on('addComplainViewInfo', 'onIndex', function (_index) {
+                vc.component.addComplainViewInfo.index = _index;
+            });
+        },
+        methods: {
+            addComplainValidate: function () {
+                return vc.validate.validate({
+                    addComplainViewInfo: vc.component.addComplainViewInfo
+                }, {
+                    'addComplainViewInfo.typeCd': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "投诉类型不能为空"
+                        },
+                        {
+                            limit: "num",
+                            param: "",
+                            errInfo: "投诉类型格式错误"
+                        },
+                    ],
+                    'addComplainViewInfo.complaintName': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "投诉人不能为空"
+                        },
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "投诉人不能大于200位"
+                        },
+                    ],
+                    'addComplainViewInfo.tel': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "投诉电话不能为空"
+                        },
+                        {
+                            limit: "phone",
+                            param: "",
+                            errInfo: "投诉电话格式错误"
+                        },
+                    ],
+                    'addComplainViewInfo.context': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "投诉内容不能为空"
+                        },
+                        {
+                            limit: "maxLength",
+                            param: "4000",
+                            errInfo: "投诉状态超过4000位"
+                        },
+                    ],
+
+                });
+            },
+            saveAddComplainInfo: function () {
+                if (vc.component.addComplainValidate()) {
+                    //侦听回传
+                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addComplainViewInfo);
+                    return;
+                }
+            }
+        }
+    });
+
+})(window.vc);

WebService/src/main/resources/components/purchaseApplyPackage/addPurchaseApplyStep/addPurchaseApplyStep.html

@@ -0,0 +1,37 @@
+<div id="component">
+
+    <div class="java110_step">
+        <div id="step"></div>
+    </div>
+
+    <!-- 选择物品 -->
+    <div v-if="addPurchaseApplyStepInfo.index == 0">
+        <vc:create name="viewResourceStoreInfo2"
+                   callBackListener="addPurchaseApplyStep"
+                   callBackFunction="notify"
+        ></vc:create>
+    </div>
+    <!-- 申请说明 -->
+    <div v-if="addPurchaseApplyStepInfo.index == 1">
+        <vc:create name="addPurchaseApplyView"
+                   callBackListener="addPurchaseApplyStep"
+                   callBackFunction="notify2"
+        ></vc:create>
+    </div>
+
+
+
+    <div class="row">
+        <div class="col-md-10"></div>
+        <div class="col-md-2 " style="margin-bottom:10px; text-align:right">
+            <button type="button" class="btn btn-secondary" v-on:click="_prevStep()">上一步</button>
+            <button v-if="addPurchaseApplyStepInfo.index != 1" type="button" class="btn btn-primary"
+                    style="margin-left:10px;" v-on:click="_nextStep()">下一步
+            </button>
+            <button v-if="addPurchaseApplyStepInfo.index == 1" type="button" class="btn btn-primary"
+                    style="margin-left:10px;" v-on:click="_finishStep()">提交
+            </button>
+        </div>
+    </div>
+
+</div>

WebService/src/main/resources/components/purchaseApplyPackage/addPurchaseApplyStep/addPurchaseApplyStep.js

@@ -0,0 +1,103 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+    vc.extends({
+        data: {
+            addPurchaseApplyStepInfo: {
+                $step: {},
+                index: 0,
+                infos: [],
+                purchaseApply:{
+                    resourceStores:[],
+                    description:'',
+                    file:'',
+
+                }
+            }
+        },
+        _initMethod: function () {
+            vc.component._initStep();
+        },
+        _initEvent: function () {
+            vc.on("addPurchaseApplyStep", "notify", function (viewResourceStoreInfo2) {
+                console.log("收到最终参数："+viewResourceStoreInfo2);
+                vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores = viewResourceStoreInfo2.resourceStores;
+            });
+
+            vc.on("addPurchaseApplyStep", "notify2", function (info) {
+                vc.component.addPurchaseApplyStepInfo.purchaseApply.description = info.description;
+            });
+
+        },
+        methods: {
+            _initStep: function () {
+                vc.component.addPurchaseApplyStepInfo.$step = $("#step");
+                vc.component.addPurchaseApplyStepInfo.$step.step({
+                    index: 0,
+                    time: 500,
+                    title: ["选择物品", "申请说明"]
+                });
+                vc.component.addPurchaseApplyStepInfo.index = vc.component.addPurchaseApplyStepInfo.$step.getIndex();
+            },
+            _prevStep: function () {
+                vc.component.addPurchaseApplyStepInfo.$step.prevStep();
+                vc.component.addPurchaseApplyStepInfo.index = vc.component.addPurchaseApplyStepInfo.$step.getIndex();
+
+                vc.emit('viewResourceStoreInfo2', 'onIndex', vc.component.addPurchaseApplyStepInfo.index);
+                vc.emit('addPurchaseApplyView', 'onIndex', vc.component.addPurchaseApplyStepInfo.index);
+
+            },
+            _nextStep: function () {
+                vc.emit('viewResourceStoreInfo2', 'getSelectResourceStores', null);
+                var _resourceStores = vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores;
+                if (_resourceStores.length == 0) {
+                    vc.message("请完善需要采购的物品信息");
+                    return;
+                }
+               for( var i = 0; i < _resourceStores.length; i++){
+                   if(_resourceStores[i].quantity <= 0){
+                       vc.message("请完善需要采购的物品信息");
+                        return;
+                   }
+               }
+                vc.component.addPurchaseApplyStepInfo.$step.nextStep();
+                vc.component.addPurchaseApplyStepInfo.index = vc.component.addPurchaseApplyStepInfo.$step.getIndex();
+
+                vc.emit('viewResourceStoreInfo2', 'onIndex', vc.component.addPurchaseApplyStepInfo.index);
+                vc.emit('addPurchaseApplyView', 'onIndex', vc.component.addPurchaseApplyStepInfo.index);
+
+            },
+            _finishStep: function () {
+                vc.emit('addPurchaseApplyViewInfo', 'setPurchaseApplyInfo', null);
+                var _description = vc.component.addPurchaseApplyStepInfo.purchaseApply.description;
+                if (_description == null || _description == '') {
+                    vc.message("请填写申请说明");
+                    return;
+                }
+                vc.http.post(
+                    'addPurchaseApply',
+                    'save',
+                    JSON.stringify(vc.component.addPurchaseApplyStepInfo.purchaseApply),
+                    {
+                        emulateJSON: true
+                    },
+                    function (json, res) {
+                        if (res.status == 200) {
+
+                            vc.message('处理成功', true);
+                            //关闭model
+                            vc.jumpToPage("/flow/purchaseApplyFlow?" + vc.objToGetParam(JSON.parse(json)));
+                            return;
+                        }
+                        vc.message(json);
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+                    });
+            }
+        }
+    });
+})(window.vc);

WebService/src/main/resources/components/purchaseApplyPackage/addPurchaseApplyView/addPurchaseApplyView.html

@@ -0,0 +1,20 @@
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox">
+            <div class="ibox-title">
+                <h5>申请说明</h5>
+                <div class="ibox-tools" style="top:10px;">
+
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">申请说明</label>
+                    <div class="col-sm-10">
+                        <textarea placeholder="必填，请填写申请说明" class="form-control"
+                                  v-model="addPurchaseApplyViewInfo.description"></textarea></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/purchaseApplyPackage/addPurchaseApplyView/addPurchaseApplyView.js

@@ -0,0 +1,67 @@
+(function (vc) {
+
+    vc.extends({
+        propTypes: {
+            callBackListener: vc.propTypes.string, //父组件名称
+            callBackFunction: vc.propTypes.string //父组件监听方法
+        },
+        data: {
+            addPurchaseApplyViewInfo: {
+                flowComponent: 'addPurchaseApplyView',
+                description:''
+
+            }
+        },
+        watch: {
+            addPurchaseApplyViewInfo: {
+                deep: true,
+                handler: function () {
+                    vc.component.saveAddComplainInfo();
+                }
+            }
+        },
+        _initMethod: function () {
+
+        },
+        _initEvent: function () {
+
+
+            vc.on('addPurchaseApplyViewInfo', 'setPurchaseApplyInfo', function () {
+                vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addPurchaseApplyViewInfo);
+            });
+
+            vc.on('addPurchaseApplyViewInfo', 'onIndex', function (_index) {
+                vc.component.addPurchaseApplyViewInfo.index = _index;
+            });
+        },
+        methods: {
+            addComplainValidate: function () {
+                return vc.validate.validate({
+                    addPurchaseApplyViewInfo: vc.component.addPurchaseApplyViewInfo
+                }, {
+                    'addPurchaseApplyViewInfo.description': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "申请说明不能为空"
+                        },
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "申请说明不能超过200位"
+                        },
+                    ],
+
+                });
+            },
+            saveAddComplainInfo: function () {
+                if (vc.component.addComplainValidate()) {
+                    //侦听回传
+                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addPurchaseApplyViewInfo);
+                    return;
+                }
+            }
+        }
+    });
+
+})(window.vc);

WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-detail/purchaseApplyDetail.html

@@ -0,0 +1,113 @@
+
+<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox ">
+                <div class="ibox-title">
+                    <h5>查询条件</h5>
+                    <div class="ibox-tools" style="top:10px;">
+
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="审核状态" disabled
+                                       v-model="purchaseApplyManageInfo.conditions.applyOrderId" class=" form-control">
+                            </div>
+                        </div>
+
+
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="申请人" disabled
+                                       v-model="purchaseApplyManageInfo.conditions.applyOrderId" class=" form-control">
+                            </div>
+                        </div>
+
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="申请时间" disabled
+                                       v-model="purchaseApplyManageInfo.conditions.applyOrderId" class=" form-control">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-12">
+                            <div class="form-group">
+                                <textarea placeholder="申请说明" disabled v-model="purchaseApplyManageInfo.conditions.applyOrderId"
+                                          type="text" placeholder="申请说明" class="form-control">
+
+                                </textarea>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>采购申请信息</h5>
+                </div>
+                <div class="ibox-content">
+
+                    <table class="footable table table-stripped toggle-arrow-tiny"
+                           data-page-size="15"
+                    >
+                        <thead>
+                        <tr>
+                            <th class="text-center">订单号</th>
+                            <th class="text-center">审批状态</th>
+                            <th class="text-center">申请人</th>
+                            <th class="text-center">申请时间</th>
+                            <th class="text-center">物品名称</th>
+                            <th class="text-center">总计价格</th>
+<!--                            <th class="text-center">操作</th>-->
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr v-for="purchaseApply in purchaseApplyManageInfo.purchaseApplys">
+                            <td class="text-center">{{purchaseApply.applyOrderId}}</td>
+                            <td class="text-center">{{purchaseApply.state}}</td>
+                            <td class="text-center">{{purchaseApply.entryPerson}}</td>
+                            <td class="text-center">{{purchaseApply.createTime}}</td>
+                            <td class="text-center">{{purchaseApply.resourceNames}}</td>
+                            <td class="text-center">{{purchaseApply.totalPrice}}</td>
+<!--                            <td class="text-center">-->
+<!--                                <div class="btn-group">-->
+<!--                                    <button class="btn-white btn btn-xs"-->
+<!--                                            v-on:click="_openEditPurchaseApplyModel(purchaseApply)">查看-->
+<!--                                    </button>-->
+<!--                                </div>-->
+<!--                                &lt;!&ndash;                                <div class="btn-group">&ndash;&gt;-->
+<!--                                &lt;!&ndash;                                    <button class="btn-white btn btn-xs"&ndash;&gt;-->
+<!--                                &lt;!&ndash;                                            v-on:click="_openEditPurchaseApplyModel(purchaseApply)">修改&ndash;&gt;-->
+<!--                                &lt;!&ndash;                                    </button>&ndash;&gt;-->
+<!--                                &lt;!&ndash;                                </div>&ndash;&gt;-->
+<!--                                <div class="btn-group">-->
+<!--                                    <button class="btn-white btn btn-xs"-->
+<!--                                            v-on:click="_openDeletePurchaseApplyModel(purchaseApply)">取消-->
+<!--                                    </button>-->
+<!--                                </div>-->
+<!--                            </td>-->
+
+                        </tr>
+                        </tbody>
+                        <tfoot>
+                        <tr>
+                            <td colspan="7">
+                                <ul class="pagination float-right"></ul>
+                            </td>
+                        </tr>
+                        </tfoot>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-detail/purchaseApplyDetail.js

@@ -0,0 +1,94 @@
+/**
+ 入驻小区
+ **/
+(function(vc){
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data:{
+            purchaseApplyManageInfo:{
+                purchaseApplys:[],
+                total:0,
+                records:1,
+                moreCondition:false,
+                applyOrderId:'',
+                states:'',
+                conditions:{
+                    state:'',
+                    applyOrderId:'',
+                }
+            }
+        },
+        _initMethod:function(){
+            vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS);
+            // vc.getDict('purchase_apply',"state",function(_data){
+            //     vc.component.purchaseApplyManageInfo.states = _data;
+            // });
+        },
+        _initEvent:function(){
+
+            vc.on('purchaseApplyManage','listPurchaseApply',function(_param){
+                vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
+            vc.on('pagination','page_event',function(_currentPage){
+                vc.component._listPurchaseApplys(_currentPage,DEFAULT_ROWS);
+            });
+        },
+        methods:{
+            _listPurchaseApplys:function(_page, _rows){
+
+                vc.component.purchaseApplyManageInfo.conditions.page = _page;
+                vc.component.purchaseApplyManageInfo.conditions.row = _rows;
+                var param = {
+                    params:vc.component.purchaseApplyManageInfo.conditions
+                };
+
+                //发送get请求
+                vc.http.get('purchaseApplyManage',
+                    'list',
+                    param,
+                    function(json,res){
+                        var _purchaseApplyManageInfo=JSON.parse(json);
+                        vc.component.purchaseApplyManageInfo.total = _purchaseApplyManageInfo.total;
+                        vc.component.purchaseApplyManageInfo.records = _purchaseApplyManageInfo.records;
+                        vc.component.purchaseApplyManageInfo.purchaseApplys = _purchaseApplyManageInfo.purchaseApplys;
+                        vc.emit('pagination','init',{
+                            total:vc.component.purchaseApplyManageInfo.records,
+                            currentPage:_page
+                        });
+                    },function(errInfo,error){
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _openAddPurchaseApplyModal:function(){
+                //vc.emit('addPurchaseApply','openAddPurchaseApplyModal',{});
+                vc.jumpToPage("/flow/addPurchaseApplyStepFlow");
+            },
+            // _openAddComplaintModal: function () {
+            //     //vc.emit('addComplaint', 'openAddComplaintModal', {});
+            //     vc.jumpToPage("/flow/addComplaintStepFlow")
+            // },
+            _openEditPurchaseApplyModel:function(_purchaseApply){
+                //vc.emit('editPurchaseApply','openEditPurchaseApplyModal',_purchaseApply);
+                vc.jumpToPage("/flow/purchaseApplyDetailFlow");
+            },
+            _openDeletePurchaseApplyModel:function(_purchaseApply){
+                vc.emit('deletePurchaseApply','openDeletePurchaseApplyModal',_purchaseApply);
+            },
+            _queryPurchaseApplyMethod:function(){
+                vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS);
+
+            },
+            _moreCondition:function(){
+                if(vc.component.purchaseApplyManageInfo.moreCondition){
+                    vc.component.purchaseApplyManageInfo.moreCondition = false;
+                }else{
+                    vc.component.purchaseApplyManageInfo.moreCondition = true;
+                }
+            }
+
+
+        }
+    });
+})(window.vc);

WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-manage/purchaseApplyManage.html

@@ -1,3 +1,4 @@
+
 <div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
     <div class="row">
         <div class="col-lg-12">
@@ -12,10 +13,20 @@
                     <div class="row">
                         <div class="col-sm-4">
                             <select class="custom-select" v-model="purchaseApplyManageInfo.conditions.state">
-                                <option selected value="">请选择订单状态</option>
-                                <option value="1003006">未审核</option>
-                                <option value="2006012">已审核</option>
-                            </select></div>
+                                <option selected value="">订单状态</option>
+                                <option value="1000">未审核</option>
+                                <option value="1001">审核中</option>
+                                <option value="1002">已审核</option>
+                            </select>
+<!--                            <select class="custom-select" v-model="purchaseApplyManageInfo.states">-->
+<!--                                <option selected disabled value="">请选择状态</option>-->
+<!--                                <option v-for="(item,index) in purchaseApplyManageInfo.states" :key="index"-->
+<!--                                        v-bind:value="item.statusCd">{{item.name}}-->
+<!--                                </option>-->
+<!--                            </select>-->
+                        </div>
+
+
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <input type="text" placeholder="请输入订单号"
@@ -52,8 +63,9 @@
                     >
                         <thead>
                         <tr>
+                            <th class="text-center">订单号</th>
                             <th class="text-center">审批状态</th>
-                            <th class="text-center">使用人</th>
+                            <th class="text-center">申请人</th>
                             <th class="text-center">申请时间</th>
                             <th class="text-center">物品名称</th>
                             <th class="text-center">总计价格</th>
@@ -62,8 +74,9 @@
                         </thead>
                         <tbody>
                         <tr v-for="purchaseApply in purchaseApplyManageInfo.purchaseApplys">
+                            <td class="text-center">{{purchaseApply.applyOrderId}}</td>
                             <td class="text-center">{{purchaseApply.state}}</td>
-                            <td class="text-center">{{purchaseApply.userName}}</td>
+                            <td class="text-center">{{purchaseApply.entryPerson}}</td>
                             <td class="text-center">{{purchaseApply.createTime}}</td>
                             <td class="text-center">{{purchaseApply.resourceNames}}</td>
                             <td class="text-center">{{purchaseApply.totalPrice}}</td>
@@ -73,14 +86,14 @@
                                             v-on:click="_openEditPurchaseApplyModel(purchaseApply)">查看
                                     </button>
                                 </div>
+<!--                                <div class="btn-group">-->
+<!--                                    <button class="btn-white btn btn-xs"-->
+<!--                                            v-on:click="_openEditPurchaseApplyModel(purchaseApply)">修改-->
+<!--                                    </button>-->
+<!--                                </div>-->
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditPurchaseApplyModel(purchaseApply)">修改
-                                    </button>
-                                </div>
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeletePurchaseApplyModel(purchaseApply)">删除
+                                            v-on:click="_openDeletePurchaseApplyModel(purchaseApply)">取消
                                     </button>
                                 </div>
                             </td>
@@ -109,5 +122,6 @@
     ></vc:create>
     <vc:create name="editPurchaseApply"></vc:create>
     <vc:create name="deletePurchaseApply"></vc:create>
+    <vc:create name="resourceStoreTable"></vc:create>
 
 </div>

WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-manage/purchaseApplyManage.js

@@ -12,15 +12,18 @@
                 records:1,
                 moreCondition:false,
                 applyOrderId:'',
+                states:'',
                 conditions:{
                     state:'',
-applyOrderId:'',
-
+                    applyOrderId:'',
                 }
             }
         },
         _initMethod:function(){
             vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS);
+            // vc.getDict('purchase_apply',"state",function(_data){
+            //     vc.component.purchaseApplyManageInfo.states = _data;
+            // });
         },
         _initEvent:function(){
             
@@ -59,10 +62,16 @@ applyOrderId:'',
                            );
             },
             _openAddPurchaseApplyModal:function(){
-                vc.emit('addPurchaseApply','openAddPurchaseApplyModal',{});
+                //vc.emit('addPurchaseApply','openAddPurchaseApplyModal',{});
+                vc.jumpToPage("/flow/addPurchaseApplyStepFlow");
             },
+            // _openAddComplaintModal: function () {
+            //     //vc.emit('addComplaint', 'openAddComplaintModal', {});
+            //     vc.jumpToPage("/flow/addComplaintStepFlow")
+            // },
             _openEditPurchaseApplyModel:function(_purchaseApply){
-                vc.emit('editPurchaseApply','openEditPurchaseApplyModal',_purchaseApply);
+                //vc.emit('editPurchaseApply','openEditPurchaseApplyModal',_purchaseApply);
+                vc.jumpToPage("/flow/purchaseApplyDetailFlow");
             },
             _openDeletePurchaseApplyModel:function(_purchaseApply){
                 vc.emit('deletePurchaseApply','openDeletePurchaseApplyModal',_purchaseApply);

WebService/src/main/resources/components/purchaseApplyPackage/view-purchaseApply-info/viewPurchaseApplyInfo.html

@@ -4,22 +4,26 @@
             <div class="ibox-title">
                 <h5>采购申请信息</h5>
                 <div class="ibox-tools" style="top:10px;">
-                    <button type="button" v-if="viewPurchaseApplyInfo.index != 2" class="btn btn-primary btn-sm" style="margin-right:10px;"  v-on:click="_openSelectPurchaseApplyInfoModel()">
-                        <i class="glyphicon glyphicon-search"></i> 选择采购申请</button>
+                    <button type="button" v-if="viewPurchaseApplyInfo.index != 2" class="btn btn-primary btn-sm"
+                            style="margin-right:10px;" v-on:click="_openSelectPurchaseApplyInfoModel()">
+                        <i class="glyphicon glyphicon-search"></i> 选择采购申请
+                    </button>
 
-                    <button type="button" v-if="viewPurchaseApplyInfo.index != 2" class="btn btn-primary btn-sm" v-on:click="_openAddPurchaseApplyInfoModel()">
-                        <i class="glyphicon glyphicon-plus"></i> 添加采购申请</button>
+                    <button type="button" v-if="viewPurchaseApplyInfo.index != 2" class="btn btn-primary btn-sm"
+                            v-on:click="_openAddPurchaseApplyInfoModel()">
+                        <i class="glyphicon glyphicon-plus"></i> 添加采购申请
+                    </button>
                 </div>
             </div>
             <div class="ibox-content">
                 <div class="row">
-<div class="col-sm-4">
+                    <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >订单状态：</label>
+                            <label class="col-form-label">订单状态：</label>
                             <label class="">{{viewPurchaseApplyInfo.state}}</label>
                         </div>
-</div>
-</div>
+                    </div>
+                </div>
 
             </div>
         </div>