清单规则取消编办绑定

modules/all_models/stdBills_lib.js

@@ -12,8 +12,6 @@ const stdBills_lib = new Schema({
 
         billsLibId: Number,
         billsLibName: String,
-        compilationId: String,
-        compilationName: String,
         deleted: Boolean
     },
     {versionKey: false}

modules/bills_lib/models/bills_lib_interfaces.js

@@ -70,8 +70,6 @@ billsLibDao.prototype.createStdBillsLib = function(clibData, callback){
         let billsLibId = result.sequence_value;
         let userAccount = clibData.userAccount;
         let billsLibName = clibData.name;
-        let compilationId = clibData.compilationId;
-        let compilationName = clibData.compilationName;
         let dateStr = moment().format('YYYY-MM-DD HH:mm:ss');
         let newStdBillsLib = {
             creator: userAccount,
@@ -79,8 +77,6 @@ billsLibDao.prototype.createStdBillsLib = function(clibData, callback){
             recentOpr: [{operator: userAccount, operateDate: dateStr}],
             billsLibId: billsLibId,
             billsLibName: billsLibName,
-            compilationId: compilationId,
-            compilationName: compilationName,
             deleted: false
         };
         StdBillsLib.create(newStdBillsLib, function(err){

modules/common/std/std_bills_lib_lists_model.js

@@ -38,9 +38,9 @@ class STDBillsLibListsModel extends BaseModel {
         let billList = [];
         for(let tmp of billLib) {
             let tmpRation = {id: tmp.billsLibId, name: tmp.billsLibName};
-            if (compilationId !== tmp.compilationId) {
+            /*if (compilationId !== tmp.compilationId) {
                 continue;
-            }
+            }*/
             if (billList.length <= 0) {
                 billList = [tmpRation];
             } else {

modules/std_billsGuidance_lib/facade/facades.js

@@ -37,16 +37,16 @@ async function getCompilationList() {
 }
 
 async function getComBillsLibInfo() {
-    let rst = [];
+    let rst = {compilationList: [], billsLibs: []};
     let compilationList = await getCompilationList();
     if(compilationList.length <= 0){
         throw '没有数据';
     }
     else{
         for(let compilation of compilationList){
-            let billsLibs = await billsLibModel.find({compilationId: compilation._id, deleted: false}, '-_id billsLibId billsLibName');
-            rst.push({_id: compilation._id, name: compilation.name, billsLibs: billsLibs});
+            rst.compilationList.push({_id: compilation._id, name: compilation.name});
         }
+        rst.billsLibs = await billsLibModel.find({deleted: false}, '-_id billsLibId billsLibName');
         return rst;
     }
 }

modules/users/controllers/compilation_controller.js

@@ -181,9 +181,9 @@ class CompilationController extends BaseController {
             let compilationModel = new CompilationModel();
             compilationList = await compilationModel.getCompilationList();
 
-            // 获取标准清单
+            // 获取标准清单，不绑定编办
             let stdBillLibListsModel = new STDBillLibListsModel();
-            billList = await stdBillLibListsModel.getBillList(selectedCompilation._id);
+            billList = await stdBillLibListsModel.getBillList();
 
             // 获取定额库
             let stdRationLibMapModel = new STDRationLibMapModel();

web/maintain/billsGuidance_lib/js/main.js

@@ -32,23 +32,12 @@ const billsGuidanceMain = (function () {
                     billsLibSels.append(libOpt);
                 }
             }
-            let comIndex = {};
-            for(let i = 0; i < rstData.length; i++){
-                let compilation = rstData[i];
-                comIndex[compilation._id] = compilation;
+            setBillsLib(rstData.billsLibs);
+            for(let i = 0; i < rstData.compilationList.length; i++){
+                let compilation = rstData.compilationList[i];
                 let comOpt = `<option value = "${compilation._id}">${compilation.name}</option>`;
                 comSels.append(comOpt);
-                //设置初始选择的清单规则库
-                if(i === 0){
-                    setBillsLib(compilation.billsLibs);
-                }
             }
-            //变更编办选择
-            comSels.on('change', function () {
-                let curComId = $(this).select().val();
-                let curCom = comIndex[curComId];
-                setBillsLib(curCom.billsLibs);
-            });
         });
     }
     //html新增库
@@ -110,13 +99,13 @@ const billsGuidanceMain = (function () {
                 if(!billsLibId){
                     throw '请选择清单规则库';
                 }
-                //新建
-                $.bootstrapLoading.start();
                 //库类型
                 let addType = $('#add').find('input:checked');
                 if(!addType){
                     throw '请选择库类型';
                 }
+                //新建
+                $.bootstrapLoading.start();
                 let createData = {type: parseInt(addType.val()), ID: uuid.v1(), name: cName, compilationId: compilationId, compilationName: compilationName, billsLibId: parseInt(billsLibId), billsLibName:billsLibName};
                 let updateData = {updateType: updateType.create, updateData: createData};
                 CommonAjax.post('/billsGuidance/api/updateBillsGuideLib', updateData, function (rstData) {

web/maintain/bills_lib/html/main.html

@@ -32,7 +32,7 @@
                   <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                       <table class="table table-hover table-bordered">
-                        <thead><tr><th>清单规则名称</th><th width="160">编办</th><th width="160">添加时间</th><th width="90">操作</th></tr></thead>
+                        <thead><tr><th>清单规则名称</th><th width="160">添加时间</th><th width="90">操作</th></tr></thead>
                         <tbody id="showArea">
                           <!--<tr><td><a href="qingdan.html">XX清单规则</a></td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
                           <tr><td><a href="qingdan.html">XX清单规则</a></td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
@@ -61,10 +61,6 @@
                       <label>清单规则名称</label>
                       <input id="createText" class="form-control" placeholder="输入清单规则名称" type="text">
                     </div>
-                      <div class="form-group">
-                          <label>编办名称</label>
-                          <select id="compilationSels" class="form-control"></select>
-                      </div>
                   </form>
                 </div>
                 <div class="modal-footer">
@@ -137,22 +133,22 @@
     let userAccount = '<%= userAccount %>';
     let deleteCount = 0;
     let preDeleteId = null;
-    mainAjax.getCompilationList();
+    //mainAjax.getCompilationList();
     mainAjax.getStdBillsLib();
     $(document).ready(function(){
         //main 增删改
         $("#createA").click(function(){
             let billsLibName = $("#createText").val();
-            let compilationName = $('#compilationSels option:selected').text();
-            let compilationId = $('#compilationSels option:selected').val();
+         /*   let compilationName = $('#compilationSels option:selected').text();
+            let compilationId = $('#compilationSels option:selected').val();*/
             if(billsLibName.trim().length === 0){
                 alert("请输入清单规则名称！");
             }
-            else if(compilationName.trim().length === 0){
+          /*  else if(compilationName.trim().length === 0){
                 alert("编办不可为空！");
-            }
+            }*/
             else {
-                mainAjax.createStdBillsLib(userAccount, billsLibName, compilationId, compilationName);
+                mainAjax.createStdBillsLib(userAccount, billsLibName);
                 $("#createText").val("");
             }
         });

web/maintain/bills_lib/scripts/bills_lib_ajax.js

@@ -62,11 +62,9 @@ var mainAjax = {
                         var billsLibName = result.data[i].billsLibName;
                         var createDate = result.data[i].createDate;
                         var createDateFmt = new Date(createDate).format("yyyy-MM-dd");
-                        let compilationName = result.data[i].compilationName;
                         $("#showArea").append(
                             "<tr id='tempId'>" +
                             "<td><a href='stdBills'>"+billsLibName+"</a></td>" +
-                            "<td>"+compilationName+" </td>" +
                             "<td>"+createDateFmt+" </td>" +
                             "<td><a href='javascript:void(0);' data-toggle='modal' data-target='#edit' title='编辑'>" +
                             "<i class='fa fa-pencil-square-o'></i></a> <a href='javascript:void(0);' data-toggle='modal' data-target='#del' class='text-danger' title='删除'>" +
@@ -80,11 +78,11 @@ var mainAjax = {
             }
         });
     },
-    createStdBillsLib: function(userAccount, billsLibName, compilationId, compilationName){
+    createStdBillsLib: function(userAccount, billsLibName){
         $.ajax({
             type: "POST",
             url: "/stdBillsEditor/createStdBillsLib",
-            data: {data: JSON.stringify({userAccount: userAccount, name: billsLibName, compilationId: compilationId, compilationName: compilationName}) },
+            data: {data: JSON.stringify({userAccount: userAccount, name: billsLibName}) },
             dataType: "json",
             success: function(result){
                 if(!result.error){
@@ -92,7 +90,7 @@ var mainAjax = {
                     var createDate = result.data[0].createDate;
                     var createDateFmt = new Date(createDate).format("yyyy-MM-dd");
                     $("#showArea").append(
-                        "<tr id='tempId'><td><a href='stdBills'>"+billsLibName+"</a></td><td>"+ compilationName+"</td><td>"+createDateFmt+" </td><td><a href='javascript:void(0);' data-toggle='modal' data-target='#edit' title='编辑'>" +
+                        "<tr id='tempId'><td><a href='stdBills'>"+billsLibName+"</a></td><td>"+createDateFmt+" </td><td><a href='javascript:void(0);' data-toggle='modal' data-target='#edit' title='编辑'>" +
                         "<i class='fa fa-pencil-square-o'></i></a> <a href='javascript:void(0);' data-toggle='modal' data-target='#del' class='text-danger' title='删除'>" +
                         "<i class='fa fa-remove'></i></a></td></tr>"
                     );