Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation

web/maintain/ration_repository/anzhuang.html

@@ -25,7 +25,7 @@
                       <a class="nav-link px-3" id="dinge" href="dinge.html">定额</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="gongliao" href="gongliao.html">工料机</a>
+                      <a class="nav-link px-3" id="gongliao" href="gongliao.html">人材机</a>
                   </li>
                   <li class="nav-item">
                       <a class="nav-link px-3" id="fuzhu" href="fuzhu.html">附注条件</a>

web/maintain/ration_repository/dinge.html

@@ -31,10 +31,10 @@
                       <a class="nav-link active px-3" id ="dinge" >定额</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="gongliao" href="#">工料机</a>
+                      <a class="nav-link px-3" id="gongliao" href="#">人材机</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="fuzhu" href="#">附注条件</a>
+                      <a class="nav-link px-3" id="fuzhu" href="#">子目换算</a>
                   </li>
                   <li class="nav-item">
                       <a class="nav-link px-3" id="anzhuang" href="anzhuang.html">安装增加费</a>
@@ -88,13 +88,13 @@
                                   <!-- 标签 -->
                                   <ul class="nav nav-tabs" role="tablist">
                                       <li class="nav-item">
-                                          <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#rDetail" role="tab">工料机</a>
+                                          <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#rDetail" role="tab">人材机</a>
                                       </li>
                                       <li class="nav-item">
                                           <a class="nav-link" id="linkFZDE" data-toggle="tab" href="#rDetail" role="tab">辅助定额调整</a>
                                       </li>
                                       <li class="nav-item">
-                                          <a class="nav-link" id="linkFZTJ" data-toggle="tab" href="#rDetail" role="tab">附注条件调整</a>
+                                          <a class="nav-link" id="linkFZTJ" data-toggle="tab" href="#rDetail" role="tab">子目换算调整</a>
                                       </li>
                                       <li class="nav-item">
                                           <a class="nav-link" id="linkAZZJ" data-toggle="tab" href="#" role="tab">安装增加费</a>

web/maintain/ration_repository/fuzhu.html

@@ -26,7 +26,7 @@
                       <a class="nav-link px-3" id="drirect-dinge" href="javascript:void(0);">定额</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link px-3" id="gongliao" href="javascript:void(0);">工料机</a>
+                      <a class="nav-link px-3" id="gongliao" href="javascript:void(0);">人材机</a>
                   </li>
                   <li class="nav-item">
                       <a class="nav-link active px-3">附注条件</a>

web/maintain/ration_repository/gongliao.html

@@ -29,7 +29,7 @@
                       <a class="nav-link px-3" id="drirect-dinge" href="/rationRepository/ration">定额</a>
                   </li>
                   <li class="nav-item">
-                      <a class="nav-link active px-3">工料机</a>
+                      <a class="nav-link active px-3">人材机</a>
                   </li>
                   <li class="nav-item">
                       <a class="nav-link px-3" id="fuzhu" href="javascript:void(0);">附注条件</a>
@@ -60,7 +60,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">添加工料机</h5>
+                  <h5 class="modal-title">添加人材机</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
                   </button>
@@ -106,7 +106,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">编辑工料机</h5>
+                  <h5 class="modal-title">编辑人材机</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
                   </button>

web/maintain/ration_repository/js/coe.js

@@ -376,7 +376,7 @@ let gljAdjOprObj = {
     setting: {
         header: [
             {headerName:"调整类型", headerWidth:100, dataCode:"coeType", dataType: "String", hAlign: "center", vAlign: "center", readOnly: false},
-            {headerName:"工料机编码", headerWidth:100, dataCode:"gljCode", dataType: "String", formatter: '@', hAlign: "center", vAlign: "center", readOnly: false},
+            {headerName:"人材机编码", headerWidth:100, dataCode:"gljCode", dataType: "String", formatter: '@', hAlign: "center", vAlign: "center", readOnly: false},
             {headerName:"名称", headerWidth:100, dataCode:"gljName", dataType: "String", hAlign: "center", vAlign: "center", readOnly: true},
             {headerName:"操作符", headerWidth:60, dataCode:"operator", dataType: "String", hAlign: "center", vAlign: "center", readOnly: false},
             {headerName:"数量", headerWidth:80, dataCode:"amount", dataType: "String", hAlign: "center", vAlign: "center" , readOnly: false},

web/maintain/ration_repository/js/ration_glj.js

@@ -250,7 +250,7 @@ var rationGLJOprObj = {
                         }
                     }
                     if (isExist) {
-                        alert("该工料机已存在！");
+                        alert("该人材机已存在！");
                         args.sheet.setValue(args.row, args.col, typeof cacheArr[args.row] !== 'undefined' ? cacheArr[args.row].code + '' : '');
                     }
                     else {
@@ -403,7 +403,7 @@ var rationGLJOprObj = {
                             return rst;
                         });
                         $('#alertModalBtn').click();
-                        $('#alertText').text("工料机"+ codes + "不存在，请查找你所需要的工料机，或新增工料机");
+                        $('#alertText').text("人材机"+ codes + "不存在，请查找你所需要的人材机，或新增人材机");
                         $('#alertModalCls').click(function () {
                             me.showGljItems(me.currentRationItem.ID);
                         });

web/maintain/ration_repository/js/repository_glj.js

@@ -219,15 +219,15 @@ repositoryGljObj = {
                 let focusToCol;
                 function getFocusToCol (me){
                     if(!me.addGljObj[me.setting.header[0].dataCode]){
-                        $('#alertGljTxt').text('编号不能为空，是否取消增加工料机?');
+                        $('#alertGljTxt').text('编号不能为空，是否取消增加人材机?');
                         return 0;
                     }
                     else if(!me.addGljObj[me.setting.header[1].dataCode]){
-                        $('#alertGljTxt').text('名称不能为空，是否取消增加工料机?');
+                        $('#alertGljTxt').text('名称不能为空，是否取消增加人材机?');
                         return 1;
                     }
                     else if(!me.addGljObj[me.setting.header[5].dataCode]){
-                        $('#alertGljTxt').text('类型不能为空，是否取消增加工料机?');
+                        $('#alertGljTxt').text('类型不能为空，是否取消增加人材机?');
                         return 5;
                     }
                     else {
@@ -426,14 +426,14 @@ repositoryGljObj = {
                 if(refGljCodes.length > 0){
                     let alertText;
                     if(refGljCodes.length > 3){
-                        alertText = "编号: " + refGljCodes[0]+" 、" + refGljCodes[1] + " 、" + refGljCodes[2] + "...等工料机已有定额引用，删除失败！";
+                        alertText = "编号: " + refGljCodes[0]+" 、" + refGljCodes[1] + " 、" + refGljCodes[2] + "...等人材机已有定额引用，删除失败！";
                     }
                     else {
                         let alertCode = " ";
                         for(let i=0; i< refGljCodes.length; i++){
                             alertCode += refGljCodes[i] + " 、";
                         }
-                        alertText = "编号：" + alertCode + "工料机已有定额引用，删除失败！"
+                        alertText = "编号：" + alertCode + "人材机已有定额引用，删除失败！"
                     }
                     $('#alertText').text(alertText);
                     $('#codeAlertBtn').click();

web/maintain/ration_repository/js/section_tree.js

@@ -12,7 +12,7 @@ let pageOprObj = {
                 me.rationLibName = rstData[0].dispName;
                 me.gljLibId = rstData[0].gljLib;
                 if(!me.gljLibId || typeof me.gljLibId === 'undefined' || me.gljLibId == -1){
-                    alert("没有引用工料机库！");
+                    alert("没有引用人材机库！");
                     window.location.href = "/rationRepository/main";
                 }
                 if (me.rationLibName) {

web/maintain/ration_repository/main.html

@@ -90,7 +90,7 @@
                             <select id="compilationSels" class="form-control"></select>
                         </div>
                         <div class="form-group">
-                            <label>工料机库</label>
+                            <label>人材机库</label>
                             <select id="gljLibSels" class="form-control"></select>
                         </div>
                     </form>

web/maintain/std_glj_lib/html/gongliao.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>工料机库编辑器</title>
+    <title>人材机库编辑器</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/maintain/std_glj_lib/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
@@ -29,7 +29,7 @@
         <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
               <ul class="nav nav-tabs" role="tablist">
                   <li class="nav-item">
-                      <a class="nav-link active px-3" href="javascript:void(0);">工料机</a>
+                      <a class="nav-link active px-3" href="javascript:void(0);">人材机</a>
                   </li>
               </ul>
         </nav>

web/maintain/std_glj_lib/html/main.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>工料机库编辑器</title>
+    <title>人材机库编辑器</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/maintain/std_glj_lib/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
@@ -21,7 +21,7 @@
         <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
           <ul class="nav navbar-nav px-1">
               <li class="nav-item">
-                  <a class="nav-link" href="javacript:void(0);" aria-haspopup="true" aria-expanded="false" data-toggle="modal" data-target="#add">新建工料机库</a>
+                  <a class="nav-link" href="javacript:void(0);" aria-haspopup="true" aria-expanded="false" data-toggle="modal" data-target="#add">新建人材机库</a>
               </li>
           </ul>
         </nav>
@@ -33,7 +33,7 @@
                   <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                       <table class="table table-hover table-bordered">
-                        <thead><tr><th>工料机库名称</th><th>编办</th><th>定额库</th><th width="160">添加时间</th><th width="90">操作</th></tr></thead>
+                        <thead><tr><th>人材机库名称</th><th>编办</th><th>定额库</th><th width="160">添加时间</th><th width="90">操作</th></tr></thead>
                         <tbody id="showArea">
                       <!--    <tr><td><a href="gongliao.html">XX工料机库</a></td><td>重庆2018</td><td>XXX定额库（重庆2018）</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="gongliao.html">XX工料机库</a></td><td>重庆2018</td><td></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>
@@ -51,7 +51,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">添加工料机库</h5>
+                  <h5 class="modal-title">添加人材机库</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
                   </button>
@@ -59,8 +59,8 @@
                 <div class="modal-body">
                   <form>
                     <div class="form-group">
-                      <label>工料机名称</label>
-                      <input id="libNameTxt" class="form-control" placeholder="输入工料机库名称" type="text">
+                      <label>人材机名称</label>
+                      <input id="libNameTxt" class="form-control" placeholder="输入人材机库名称" type="text">
                     </div>
                     <div class="form-group">
                       <label>编办名称</label>
@@ -80,7 +80,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">编辑工料机库</h5>
+                  <h5 class="modal-title">编辑人材机库</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
                   </button>
@@ -88,8 +88,8 @@
                 <div class="modal-body">
                   <form>
                     <div class="form-group">
-                      <label>工料机库名称</label>
-                      <input class="form-control" id="renameText" placeholder="输入工料机库名称" type="text" value="">
+                      <label>人材机库名称</label>
+                      <input class="form-control" id="renameText" placeholder="输入人材机库名称" type="text" value="">
                     </div>
                     <div class="form-group">
                       <label>编办名称</label>

web/maintain/std_glj_lib/js/glj.js

@@ -127,7 +127,7 @@ let repositoryGljObj = {
                     if(result.data.length > 0){
                         me.rationLibs = result.data[0].rationLibs;
                         $(".navbar-text").append(
-                            "<a href='/stdGljRepository/main'>工料机库</a><i class='fa fa-angle-right fa-fw'></i>"+result.data[0].dispName
+                            "<a href='/stdGljRepository/main'>人材机库</a><i class='fa fa-angle-right fa-fw'></i>"+result.data[0].dispName
                         );
                         pageOprObj.gljLibName = result.data[0].dispName;
                     }
@@ -359,15 +359,15 @@ let repositoryGljObj = {
                 let focusToCol;
                 function getFocusToCol (me){
                     if(!me.addGljObj[me.setting.header[0].dataCode]){
-                        $('#alertGljTxt').text('编号不能为空，继续增加工料机?');
+                        $('#alertGljTxt').text('编号不能为空，继续增加人材机?');
                         return 0;
                     }
                     else if(!me.addGljObj[me.setting.header[1].dataCode]){
-                        $('#alertGljTxt').text('名称不能为空，继续增加工料机?');
+                        $('#alertGljTxt').text('名称不能为空，继续增加人材机?');
                         return 1;
                     }
                     else if(!me.addGljObj[me.setting.header[5].dataCode]){
-                        $('#alertGljTxt').text('类型不能为空，继续增加工料机?');
+                        $('#alertGljTxt').text('类型不能为空，继续增加人材机?');
                         return 5;
                     }
                     else {
@@ -646,7 +646,7 @@ let repositoryGljObj = {
                 }
                 if(removeArr.length > 0 || updateArr.length > 0){
                     //删除警告
-                    let upAlertText = removeArr.length > 0 ? '可能已有定额引用了当前工料机，导致定额查找不到此工料机。确定要删除吗？' : '确认删除选中字段？';
+                    let upAlertText = removeArr.length > 0 ? '可能已有定额引用了当前人材机，导致定额查找不到此人材机。确定要删除吗？' : '确认删除选中字段？';
                     $('#alertGljTxt').text(upAlertText);
                     $('#gljAlertBtn').click();
                     //确认

web/maintain/std_glj_lib/js/gljComponent.js

@@ -303,7 +303,7 @@ let gljComponentOprObj = {
                 }
             }
             if(!hasCode){
-                alert("不存在此工料机，请先添加！");
+                alert("不存在此人材机，请先添加！");
                 args.sheet.setValue(args.row, args.col, me.currentEditingComponent[me.setting.header[args.col].dataCode] ?
                     me.currentEditingComponent[me.setting.header[args.col].dataCode] : '');
                 //不存在

web/maintain/std_glj_lib/js/main.js

@@ -24,7 +24,7 @@ $(function () {
                     $('#libNameTxt').val('')
                 }
                 else if(dispNames.indexOf(libName) !== -1){
-                    alert('此工料机库已存在！');
+                    alert('此人材机库已存在！');
                     $('#libNameTxt').val('')
                 }
                 else if(compilationName.trim().length === 0){
@@ -58,7 +58,7 @@ $(function () {
                     $("#renameText").val('');
                 }
                 else if(dispNameArr.indexOf(newName) !== -1){
-                    alert("该工料机库已存在！");
+                    alert("该人材机库已存在！");
                     $("#renameText").val('');
                 }
                 else{
@@ -204,9 +204,9 @@ function removeGljLib(delObj, dispNames){
         dataType: 'json',
         success: function (result) {
             if(!result.error){
-                if(result.message === '此工料机库已被引用！'){
+                if(result.message === '人材机库已被引用！'){
                     $('#delCancelBtn').click();
-                    alert("此工料机库已被引用，不可删除！");
+                    alert("此人材机库已被引用，不可删除！");
                 }
                 else if(result.message === '删除成功'){
                     var jqSel = "#"+ delObj.libId;

web/users/js/compilation.js

@@ -348,7 +348,7 @@ function getAndValidData(model) {
     }
 
     if (model === 'glj' && (gljLib === '' || gljLib === undefined)) {
-        throw '请选择工料机库';
+        throw '请选择人材机库';
     }
 
     if (model === 'fee' && (feeLib === '' || feeLib === undefined)) {
@@ -427,7 +427,7 @@ function validLib() {
         }
 
         if ($("input:hidden[name='glj_lib']").length <= 0) {
-            throw '请添加工料机库';
+            throw '请添加人材机库';
         }
 
         if ($("input:hidden[name='fee_lib']").length <= 0) {

web/users/views/compilation/add.html

@@ -35,7 +35,7 @@
                                 <th>工程名称</th>
                                 <th>标准清单</th>
                                 <th>定额库</th>
-                                <th>工料机库</th>
+                                <th>人材机库</th>
                                 <th>费率标准</th>
                                 <th>人工系数</th>
                                 <th>操作</th>

web/users/views/compilation/engineering.html

@@ -54,7 +54,7 @@
                                 <a href="#" class="btn btn-link btn-sm add-compilation" data-model="ration">添加</a>
                             </div>
                             <div class="form-group col-md-4">
-                                <label>工料机库</label>
+                                <label>人材机库</label>
                                 <div class="glj-list">
                                     <% if (Object.keys(libData).length > 0 && libData.glj_lib.length > 0) { %>
                                     <% libData.glj_lib.forEach(function (glj, index){ %>

web/users/views/compilation/modal.html

@@ -32,11 +32,11 @@
                     </div>
                 </div>
                 <div class="form-group" id="glj-area">
-                    <label>工料机库</label>
+                    <label>人材机库</label>
                     <div class="row">
                         <div class="col-xs-12">
                             <select class="form-control" name="glj_lib">
-                                <option value="">请选择工料机库</option>
+                                <option value="">请选择人材机库</option>
                             </select>
                         </div>
                     </div>

web/users/views/tool/index.html

@@ -26,7 +26,7 @@
             </div>
             <div class="col-xs-6 mb-30 ">
                 <div class="c-body">
-                    <h2>工料机库
+                    <h2>人材机库
                         <a href="/stdGljRepository/main" class="btn btn-primary pull-right">进入</a></h2>
                 </div>
             </div>