adgasjd

.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/compiler.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="USE_RELEASE_OPTION" value="false" />
+    <bytecodeTargetLevel target="8" />
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-encoding utf-8" />
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

.idea/icore-pass.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/icore-pass.iml" filepath="$PROJECT_DIR$/.idea/icore-pass.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

build/utils.js

@@ -19,14 +19,8 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "TMS", "appoint", "WMS", "queue"];
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
-let devModules = [
-  "index",
-  "inward",
-  "RMS",
-  "statisticalReport",
-  "WMS",
-  "appoint"
-];
+let devModules = ["all"];
+
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;
 }

config/index.js

@@ -65,8 +65,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://172.16.33.166:80",
-    target: "http://localhost:8080",
+    target: "http://172.16.33.166:80",
+    // target: "http://localhost:8080",
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {

package.json

@@ -148,7 +148,8 @@
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",
     "webpack-merge": "^4.1.0",
-    "webpack-node-externals": "^1.7.2"
+    "webpack-node-externals": "^1.7.2",
+    "codemirror": "5.65.5"
   },
   "engines": {
     "node": ">= 6.0.0",

src/components/default.vue

@@ -50,7 +50,7 @@ export default {
         }
     }).catch((err) =>{
         window.top.localStorage.setItem('activeMenu',item.menuId)
-        that.$emit('gotoSetPage', item);           
+        that.$emit('gotoSetPage', item);
     })
     },
     getTop10 () {

src/components/main.vue

@@ -62,7 +62,7 @@
                     </li> -->
             <li @click="signOut">
                 <span class="st-icons st-icons-out"></span>退出登录
-            </li>        
+            </li>
           </ul>
         </div>
       </div>
@@ -326,28 +326,36 @@
               >
             </el-breadcrumb>
           </div>
-          <div class="sl-header-li-websocket">
+          <div class="sl-header-li-websocket" @mouseenter="updatecss" @mouseleave="leave">
             <el-badge
-              :value="task1Num + task2Num"
+              :value="taskAllNum"
               :max="99"
               class="item"
               style="margin-right: 20px"
-              v-if="task1Num + task2Num > 0"
             >
               <el-button type="text" size="small" @click="goMyTaskPage"
                 >待办任务</el-button
               >
             </el-badge>
-            <el-badge
-              :value="myMessageLength"
-              :max="99"
-              class="item"
-              v-if="myMessageLength > 0"
-            >
-              <el-button type="text" size="small" @click="goNoticePage"
-                >公告</el-button
-              >
-            </el-badge>
+            <div class="Web_Notice" v-show="socketshow">
+              <div class="workspace_row-grid_mytask" >
+                <div class="workspace_message" v-for="(item, index) in noticedata" :key="index" @click="seeTaskContent(item)">
+                  <div class="workspace_message-title">
+                    标题： {{ item.noticetitle }}
+                  </div>
+                  <div class="workspace_message-date">
+                    时间：{{ item.inserttime }}
+                  </div>
+                  <div class="workspace_message-content">
+                    内容：{{ item.noticecontent }}
+                  </div>
+                  <div class="workspace_message-from">
+                    来自: {{ item.insertusername }}
+                  </div>
+                </div>
+                <div class="workspace_replace_item"></div>
+              </div>
+            </div>
           </div>
           <div class="theme-defined">
             <div
@@ -398,7 +406,7 @@
                 "
                 :style="minHeight"
               ></iframe>
-              
+
             </el-tab-pane>
           </el-tabs>
           <div class="contextmenu">
@@ -640,8 +648,16 @@
         >
       </div>
     </el-dialog>
+
+    <!--通知-->
+<!--    <div class="Web_Notice">
+      <span class="margin_R10">
+        <i class="el-icon-message iconImg"></i>
+        <el-badge :value="taskAllNum" :max="99" :hidden="taskAllNum < 1"></el-badge>
+      </span>
+    </div>-->
   </div>
-</template> 
+</template>
 
 <script>
 import element_css_json_import from "../assets/json/element_css.js";
@@ -883,7 +899,11 @@ export default {
       styleControll: false,
       dutyId: "",
       appId: '',
-      defaultActiveIndex: '' 
+      defaultActiveIndex: '',
+      taskAllNum: '',//任务数目
+      socketshow: false,//通知框的显示
+      orgcodezs: '',//cookie中的orgcode
+      noticedata: [],//通知的数据
     };
   },
   created() {
@@ -899,6 +919,7 @@ export default {
     } else {
       this.styleControll = false;
     }
+    this.getinformation();
   },
   destroyed() {
     // 销毁浏览器返回监听
@@ -911,6 +932,7 @@ export default {
   beforeCreate() {
     let userId = getCookie("userId");
     this.appId = getCookie("appId");
+    this.orgcodezs=getCookie("orgCode");
     let menuId = window.top.localStorage.getItem("activeMenu");
     let companyId = window.top.localStorage.getItem("companyId");
   },
@@ -1065,7 +1087,7 @@ export default {
     var arr = ["#/authManage"];
     if($.inArray(location.hash, arr) == -1){
         //that.getMyToDoDelegateTask();
-        //that.getMyToDoTask();        
+        //that.getMyToDoTask();
     }
 
     that.getMyMessage();
@@ -2447,7 +2469,7 @@ export default {
           if (tree[i].menuId == menuId){
             tree[i]["menuIndex"] = menuIndex;
             return tree[i];
-          } 
+          }
 
             if (
               tree[i].hasOwnProperty("children") &&
@@ -2502,12 +2524,43 @@ export default {
         path: "/",
       });
     },
+    updatecss () {
+      this.socketshow=true;
+      let height = document.body.clientHeight - 125;
+      this.$nextTick(() => {
+        $('.Web_Notice')[0].style.height = height + 'px;'
+      })
+    },
+    leave(){
+      this.socketshow=false;
+    },
+    getinformation(){
+      this.axios.post("/api/v1/ams/getNotice",{orgcodezs:this.orgcodezs}).then((res)=>{
+         this.noticedata=res.data.data;
+         this.taskAllNum=res.data.data[0].taskAllNum
+         console.log(this.noticedata)
+        console.log(this.taskAllNum)
+      })
+    },
+    // 查看待办任务详情
+    seeTaskContent (item) {
+      this.$refs.defaultpage.seeTaskContent(item);
+      // // this.dialogVisible = true;
+      // this.itemTask = item;
+    },
   },
 };
 </script>
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 
 <style lang="less" scoped>
+
+.Web_Notice{
+  width: 300px;
+  position: absolute;
+  left: -100px;
+  background-color: #f1f6fd;
+}
 /deep/ .privilegeArea {
   .el-dialog {
     min-width: 400px;

src/views/RMS/components/oilPrice.vue

@@ -15,7 +15,7 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable 
+      <dilTable
         v-bind.sync="options"
         :isKuang="isKuang"
         @func="func"
@@ -109,7 +109,7 @@ export default {
           }
         })
       }).catch(() => {
-        this.$message.info('已取消删除');       
+        this.$message.info('已取消删除');
       });
     },
     onEnable(scope){
@@ -125,12 +125,12 @@ export default {
           }else{
             this.$message({ type: "error", message: "启用失败，请联系管理员!",});
           }
-          
-        }); 
+
+        });
       }).catch(() => {
-        this.$message.info('已取消启用该油价!');       
+        this.$message.info('已取消启用该油价!');
       });
-        
+
     }
   },
 }

src/views/TMS/components/bmstruck/detailsTruckOrder.vue

@@ -57,4 +57,4 @@ export default {
     padding: 1.25rem 1.875rem;
   }
 }
-</style>
+</style>

src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -521,13 +521,13 @@ export default {
         });
         that.tableDataReal=tableData;
         if(tableData.length<=0){
-          that.$confirm('查询不到相关车皮!请联系万州港相关人员!')
+          that.$confirm('查询不到相关车皮!可能是没有出库，请联系万州港相关人员!')
           .then(_ => {
             that.isSend=false;
             done();
           });
         }else if(tableData.length<importData.length){
-           that.$confirm("共"+(importData.length-tableData.length)+"条车皮查询失败!请联系万州港相关人员!")
+           that.$confirm("共"+(importData.length-tableData.length)+"条车皮查询失败!可能是没有出库，请联系万州港相关人员!")
           .then(_ => {
             that.isSend=false;
             done();

src/views/inward/components/truckAppoint/addPlan.vue

@@ -29,7 +29,7 @@
 </div>
     <template>
 			<div>		
-			<dilTable v-bind.sync="first" @radio-change="currentRadioChange" ref="table">
+			<mergeRowTable v-bind.sync="first" @radio-change="currentRadioChange" ref="table">
             <el-table-column fixed="right" label="操作" width="120">
                 <template slot-scope="scope">
                   <el-button type="text" size="mini" @click="deleteRequirement(scope)">
@@ -37,7 +37,7 @@
                   </el-button>
                 </template>
               </el-table-column>
-			</dilTable>
+			</mergeRowTable>
       </div>
 		</template>
     <div class="button-box">
@@ -62,6 +62,8 @@ export default {
       first:{
         requestUrl:"/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2",
         selectionType: "radio",
+        columnIndexs:[0,1,2,3,4,20,21,22],
+        comparison: "requirementNumber",
 				mapList: {},
       },
       numberValidateForm: {

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -311,7 +311,7 @@
       </el-drawer>
     </div>
     <div class="button-box">
-      <el-button type="primary" @click="makeSure" :disabled="disabled"
+      <el-button type="primary" @click="makeSure" 
         >确认新增</el-button
       >
       <el-button type="primary" @click="cancel">返回</el-button>
@@ -579,15 +579,13 @@ export default {
       //执行选择
     },
     handleClose2(done) {
-      console.log("add2");
-
       console.log(this.tableData.length);
-      console.log("ad");
-      if (this.tableData.length > 0 && this.selectionList1.length > 0) {
+      console.log("this.form.requirementType:",this.form.requirementType);
+      if (this.tableData.length > 0 && this.selectionList1.length > 0 && this.form.requirementType!='倒库') {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
-      if (this.selectionList1.length > 1) {
+      if (this.selectionList1.length > 1 && this.form.requirementType!='倒库') {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
@@ -669,12 +667,11 @@ export default {
     // 返回主界面
     makeSure1() {
       console.log(this.tableData.length);
-      console.log("ad");
-      if (this.tableData.length > 0 && this.selectionList1.length > 0) {
+      if (this.tableData.length > 0 && this.selectionList1.length > 0 && this.form.requirementType!="倒库") {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
-      if (this.selectionList1.length > 1) {
+      if (this.selectionList1.length > 1 && this.form.requirementType!="倒库") {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
@@ -800,6 +797,10 @@ export default {
       // console.log("进来了");
       // console.log(this.whether);
       // console.log(this.installremark);
+      if (this.tableData.length > 1 && this.form.requirementType!='倒库') {
+        this.$message.warning("非倒库需求只允许填写一个物资");
+        return;
+      }
       if (this.whether == 2 && this.installremark == "") {
         console.log("确实进来了");
         this.$message.warning("请选择装机必填");

src/views/inward/components/truckAppoint/plan.vue

@@ -89,7 +89,7 @@
             </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="third">
-            <dilTable v-bind.sync="third" ref="table2">
+            <mergeRowTable v-bind.sync="third" ref="table2">
               <el-table-column
                 fixed="right"
                 align="center"
@@ -132,7 +132,7 @@
                   </el-form>
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
           <!-- <el-tab-pane label="已完成" name="fourth">
             <dilTable
@@ -201,6 +201,8 @@ export default {
         mapList: []
       },
       third: {
+        columnIndexs:[0,1,2,3,4,5,9,10,13,16,21,22],
+        comparison: "requirementNumber",
         // second请求数据的地址
         requestUrl: ""
       },

src/views/inward/components/truckAppoint/requirement.vue

@@ -36,7 +36,7 @@
       <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="未下发" name="first">
-            <dilTable
+            <mergeRowTable
               v-bind.sync="first"
               @selection-change="selectionChange"
               ref="table"
@@ -52,10 +52,10 @@
                   </el-button>
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
-            <dilTable
+            <mergeRowTable
               v-bind.sync="second"
               ref="table1"
               :isPagination="false"
@@ -71,7 +71,7 @@
                   >
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -92,9 +92,13 @@ export default {
         // first请求数据的地址
         requestUrl: "",
         selectionType: "select",
+        columnIndexs:[0,1,2,6,7,8,9,22],
+        comparison: "requirementNumber",
         mapList: []
       },
       second: {
+        columnIndexs:[0,1,5,6,7,8,9,21],
+        comparison: "requirementNumber",
         // second请求数据的地址
         requestUrl: ""
       },

src/views/inward/components/truckAppoint/requirementOther.vue

@@ -44,7 +44,7 @@
       <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="未下发" name="first">
-            <dilTable
+            <mergeRowTable
               v-bind.sync="first"
               @selection-change="selectionChange"
               ref="table1"
@@ -60,10 +60,10 @@
                   </el-button>
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
-            <dilTable v-bind.sync="second" ref="table">
+            <mergeRowTable v-bind.sync="second" ref="table">
               <el-table-column fixed="right" label="操作" width="80">
                 <template slot-scope="scope">
                   <el-button
@@ -74,7 +74,7 @@
                   >
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -95,10 +95,14 @@ export default {
         // first请求数据的地址
         requestUrl: "",
         selectionType: "select",
+        columnIndexs:[0,1,2,6,7,8,9,22],
+        comparison: "requirementNumber",
         mapList: []
       },
       second: {
         // second请求数据的地址
+        columnIndexs:[0,1,5,6,7,8,9,21],
+        comparison: "requirementNumber",
         requestUrl: ""
       },
       tableData: [],

src/views/inward/components/truckOrder/plan.vue

@@ -12,7 +12,7 @@
       <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="待分解" name="second">
-            <dilTable v-bind.sync="second" ref="table1">
+            <mergeRowTable v-bind.sync="second" ref="table1">
               <el-table-column fixed="right" label="操作" width="100">
                 <template slot-scope="scope">
                   <el-button
@@ -24,10 +24,10 @@
                   </el-button>
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
           <el-tab-pane label="已分解" name="third">
-            <dilTable v-bind.sync="third" ref="table2">
+            <mergeRowTable v-bind.sync="third" ref="table2">
               <el-table-column fixed="right" label="操作" width="180">
                 <template slot-scope="scope">
                   <el-button
@@ -76,11 +76,11 @@
                   </el-form>
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
 
           <el-tab-pane label="已完成" name="four">
-            <dilTable v-bind.sync="four" ref="table3"> </dilTable>
+            <mergeRowTable v-bind.sync="four" ref="table3"> </mergeRowTable>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -95,14 +95,20 @@ export default {
       inputText: "",
       carrierId: 40,
       first: {
+        columnIndexs:[0,1,2,3,4,5,9.10,21,22],
+        comparison: "requirementNumber",
         // first请求数据的地址
         requestUrl: ""
       },
       second: {
+        columnIndexs:[0,1,2,3,4,5,9.10,21,22],
+        comparison: "requirementNumber",
         // second请求数据的地址
         requestUrl: ""
       },
       third: {
+        columnIndexs:[0,1,2,3,4,5,9.10,21,22],
+        comparison: "requirementNumber",
         // second请求数据的地址
         requestUrl: ""
       },

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -86,7 +86,7 @@
         </table>
 
 
-     
+
 
         <!-- tablePart4 -->
         <table
@@ -117,13 +117,13 @@
         >
           <tr>
             <th style="width: 7.62%">备注</th>
-            <td style="width: 20%"></td>
-           
+            <td style="width: 20%">{{note}}</td>
+
           </tr>
         </table>
       </div>
 
-     
+
 
       <div>
         <!-- tablePart6 -->
@@ -238,6 +238,7 @@ export default {
       month: new Date().getMonth() + 1,
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
+      note: "",
     };
   },
   created() {
@@ -274,6 +275,7 @@ export default {
           this.town = res.data.town;
           this.deliveryAddress = res.data.deliveryAddress;
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList;
+          this.note=res.data.note;
         });
     },
     backScan() {