Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

.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

@@ -21,6 +21,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "WMS", "inward"];
 let devModules = ["all"];
 
+
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;
 }

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://localhost:8080",
+    //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/DilCommonUI/packages/table/src/table.vue

@@ -21,6 +21,8 @@
       element-loading-spinner="el-icon-loading"
       :isHeigth="isHeigth"
       :shiyHeigth="shiyHeigth"
+      :summary-method="getSummaries"
+      :show-summary="isshowSummary"
     >
       <!-- 多选列 -->
       <el-table-column
@@ -124,6 +126,14 @@ export default {
     shiyHeigth: {
       default: null
     },
+    isshowSummary: {
+      default: false
+    },
+    showSummaryList: {
+      default() {
+        return [];
+      }
+    },
     isHeigth: {
       default: false
     },
@@ -266,6 +276,44 @@ export default {
     },
     toggleRowExpansion(row, expanded) {
       this.$refs.mainTable.toggleRowExpansion(row, expanded);
+    },
+    //合计
+    //表尾合计行
+    getSummaries(param) {
+      console.log(param);
+      const { columns, data } = param;
+      console.log("columns");
+      console.log(columns);
+      console.log("data");
+      console.log(data);
+      const sums = [];
+      columns.forEach((column, index) => {
+        //如果索引值为0,则展示‘合计’
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        console.log(column);
+        if (this.showSummaryList.includes(column.property)) {
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index];
+          } else {
+            sums[index] = "N/A";
+          }
+        }
+        //遍历数组,找到符合条件的列
+      });
+
+      return sums;
     }
   }
 };

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/WMS/components/steel/bar1_steel/bar1_addSteelInbound.vue

@@ -15,6 +15,18 @@
       <span class="text">件数：</span>
       <el-input class="input" v-model="materialNumber"> </el-input>
     </div>
+    <div class="materialNumber from">
+      <span class="text">理重(磅重)</span>
+      <el-input class="input" v-model="materialTheWeight" disabled> </el-input>
+    </div>
+    <div class="materialNumber from">
+      <span class="text">实重</span>
+      <el-input class="input" v-model="actuallyWeight"> </el-input>
+    </div>
+    <div class="materialNumber from">
+      <span class="text">备注</span>
+      <el-input class="input" v-model="remark"> </el-input>
+    </div>
     <!-- 模态窗口 -->
     <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
       <div style="margin-bottom: 10px">
@@ -88,7 +100,10 @@ export default {
       second: {
         requestUrl: "",
         selectionType: "radio"
-      }
+      },
+      materialTheWeight: 0,
+      actuallyWeight: 0,
+      remark: null
     };
   },
   watch: {
@@ -96,6 +111,9 @@ export default {
       if (!val) {
         this.input = null;
       }
+    },
+    materialNumber() {
+      this.getTheoreticalByInfo();
     }
   },
   created() {
@@ -104,6 +122,30 @@ export default {
     this.endTime = new Date(this.startTime + 86400000);
   },
   methods: {
+    getTheoreticalByInfo() {
+      this.axios
+        .post(
+          "/api/v1/wms/getTheoreticalByInfo?warehouseId=" +
+            1 +
+            "&materialCode=" +
+            this.materialCode +
+            "&materialSpecification=" +
+            this.materialSpecification +
+            "&materialModel=" +
+            this.materialModel +
+            "&num=" +
+            this.materialNumber +
+            "&status=1"
+        )
+        .then(res => {
+          if (res.data.data == -1) {
+            this.$message.error("数量超出");
+            this.materialTheWeight = null;
+          } else {
+            this.materialTheWeight = parseFloat(res.data.data);
+          }
+        });
+    },
     formatDate(date, fmt) {
       if (/(y+)/.test(fmt)) {
         fmt = fmt.replace(
@@ -188,6 +230,10 @@ export default {
     },
     // 确认
     onClickConfirm() {
+      if (!isNumber(this.actuallyWeight)) {
+        this.$message.error("实重填写不正确");
+        return;
+      }
       // console.log(this.warehouseId,this.materialCode,this.materialNumber);
       this.disabled = true;
       this.axios
@@ -201,7 +247,13 @@ export default {
             "&materialModel=" +
             this.materialModel +
             "&quantity=" +
-            this.materialNumber
+            this.materialNumber +
+            "&actuallyWeight=" +
+            Number(parseFloat(this.actuallyWeight)) +
+            "&materialTheWeight=" +
+            Number(parseFloat(this.materialTheWeight)) +
+            "&remark=" +
+            this.remark
         )
         .then(res => {
           console.log(res.data);

src/views/WMS/components/steel/bar1_steel/bar1_steel_inbound.vue

@@ -1,29 +1,47 @@
 //入库
 <template>
-  <div class="steel_inbound">
+  <div class="steel_inbound01">
     <div class="sache">
-      <!-- <el-input
-        placeholder="请输入内容"
-        v-model="inputText"
-        clearable>
-      </el-input>
-       -->
-      <span>扫码时间：</span>
-      <el-date-picker
-        v-model="startTime"
-        type="datetime"
-        placeholder="选择日期"
-      >
-      </el-date-picker>
-      <span>至</span>
-      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-button type="primary" class="btn" @click="onreserved">
-        入库
-      </el-button>
+      <el-form :inline="true">
+        <el-form-item>
+          <span class="text">入库时间：</span>
+          <el-date-picker
+            disabled
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期"
+            style="width: 200px;"
+          >
+          </el-date-picker>
+          <span class="text">至</span>
+          <el-date-picker
+            disabled
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期"
+            style="width: 200px;"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <span class="text">物资类型</span>
+          <el-autocomplete
+            v-model="inputText"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入内容"
+            @select="handleSelect"
+            style="width: 200px;"
+          ></el-autocomplete>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+          <el-button type="primary" class="btn" @click="onreserved">
+            入库
+          </el-button>
+        </el-form-item>
+      </el-form>
     </div>
     <div class="table">
       <dilTable v-bind.sync="options">
@@ -102,6 +120,25 @@ export default {
     padLeftZero(str) {
       return ("00" + str).substr(str.length);
     },
+    querySearch(queryString, cb) {
+      var restaurants = [
+        { value: "螺纹钢" },
+        { value: "盘螺" },
+        { value: "乱尺" }
+      ];
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    createFilter(queryString) {
+      return restaurant => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
@@ -126,6 +163,9 @@ export default {
             endTime +
             "&i=" +
             new Date();
+          this.options.requestQuery = {
+            materialNames: this.inputText
+          };
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else{
@@ -152,13 +192,15 @@ export default {
 };
 </script>
 
-<style lang="scss" scode>
-.steel_inbound {
+<style lang="scss" scoped>
+.steel_inbound01 {
   .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
   }
 }
 </style>

src/views/WMS/components/steel/bar1_steel/bar1_steel_inboundStatistics.vue

@@ -3,7 +3,11 @@
   <div class="steel_inboundStatistics">
     <div class="sache">
       <span>入库时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
       </el-date-picker>
       <span>至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
@@ -17,18 +21,23 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-col :span="3" v-html="'\u2003'"/>
+      <el-col :span="3" v-html="'\u2003'" />
       <span>生产总件数</span>
       <el-input
         placeholder="请输入内容"
         v-model="input3"
-        :disabled="true" class="inputs" style="width:10%">
+        :disabled="true"
+        class="inputs"
+        style="width:10%"
+      >
       </el-input>
       <span>生产总重量</span>
       <el-input
         placeholder="请输入内容"
         v-model="input4"
-        :disabled="true" style="width:10%">
+        :disabled="true"
+        style="width:10%"
+      >
       </el-input>
     </div>
     <div class="table">
@@ -40,51 +49,51 @@
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from '@/utils/util.js';
+import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-      rowClassName({row, rowIndex}) {
+  data() {
+    return {
+      rowClassName({ row, rowIndex }) {
         if (rowIndex === 0) {
-          return 'success-row';
+          return "success-row";
         }
-        return '';
+        return "";
       },
-      input1: '',
-      input2: '',
-      input3: '',
-      input4: '',
-      input5: '',
-      inputText:"",
+      input1: "",
+      input2: "",
+      input3: "",
+      input4: "",
+      input5: "",
+      inputText: "",
       startTime: null,
       endTime: null,
       region: "0",
-      options:{
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+1,
+        requestUrl:
+          "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId=" + 1
         // selectionType: "select",
         // mapList: [],
-      },
-    }
+      }
+    };
   },
-  created(){
-    console.log(this.options.data)
+  created() {
+    console.log(this.options.data);
   },
-  methods:{
-    func(res){
+  methods: {
+    func(res) {
       // console.log(res.list[0])
       // this.input1 = this.input1 + e.furnaceNumber1,
       let num1 = 0;
       let num2 = 0;
       res.list.forEach(e => {
-        console.log(e)
-        console.log(e.count)
-        console.log(e.weight)
-        num1 = num1 + e.count,
-        num2 = num2 + e.weight
+        console.log(e);
+        console.log(e.count);
+        console.log(e.weight);
+        (num1 = num1 + e.count), (num2 = num2 + e.weight);
       });
       this.input3 = num1;
-      this.input4 = num2;
+      this.input4 = (num2 / 1000).toFixed(3);
       // this.input1 = res.list[0].furnaceNumber1,
       // this.input2 = res.list[0].materialName,
       // this.input3 = res.list[0].count,
@@ -95,53 +104,60 @@ export default {
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     // 获取当前月份的最后一天
-    getdaysinmonth(year,month){
-      month = parseInt(month,10)+1;
+    getdaysinmonth(year, month) {
+      month = parseInt(month, 10) + 1;
       let days = 0;
-      month = month -1;
-      console.log("othermonth"+month)
-      console.log("otheryear"+year);
+      month = month - 1;
+      console.log("othermonth" + month);
+      console.log("otheryear" + year);
       // 根据月份获取对应的天数
-      if(month == 2){
-        days = year % 4 == 0?29:28;
-      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+      if (month == 2) {
+        days = year % 4 == 0 ? 29 : 28;
+      } else if (
+        month == 1 ||
+        month == 3 ||
+        month == 5 ||
+        month == 7 ||
+        month == 8 ||
+        month == 10 ||
+        month == 12
+      ) {
         days = 31;
-      }else{
+      } else {
         days = 30;
       }
-      console.log("otherdays"+days)
+      console.log("otherdays" + days);
       return days;
     },
-    onclick(){
-
+    onclick() {
       let startTime = null;
       let endTime = null;
       // 判断用户有没有班次，有班次则提供默认时间
-      if(this.region!=null){
-        let date =null;
-        let date2 =null;
+      if (this.region != null) {
+        let date = null;
+        let date2 = null;
         let year = null;
-        let month =null;
+        let month = null;
         let day = null;
         let year2 = null;
-        let month2 =null;
+        let month2 = null;
         let day2 = null;
         // 判断当前日期输入框中是否选择了时间,并且开始日期和结束日期是否是同一天
-        if(this.startTime!=null){
-            date = this.startTime;
-            // 判断当前开始时间是标准时间还是字符串时间
-            
-           year = date.getFullYear(); // 年
+        if (this.startTime != null) {
+          date = this.startTime;
+          // 判断当前开始时间是标准时间还是字符串时间
+
+          year = date.getFullYear(); // 年
           month = date.getMonth() + 1; // 月
-          day = date.getDate(); // 日 
+          day = date.getDate(); // 日
         }
-        if(this.endTime!=null){
-           date2 = this.endTime;
-           year2 = date2.getFullYear(); // 年
+        if (this.endTime != null) {
+          date2 = this.endTime;
+          year2 = date2.getFullYear(); // 年
           month2 = date2.getMonth() + 1; // 月
           day2 = date2.getDate(); // 日 // 日
         }
-        if(this.startTime==null&&this.endTime==null){
+        if (this.startTime == null && this.endTime == null) {
           // 获取当前的日期时间
           date = new Date();
           year = date.getFullYear(); // 年
@@ -149,50 +165,53 @@ export default {
           day = date.getDate(); // 日
         }
         // 判断开始日期和结束日期是否是同一天
-        if(!(year==year2&&month==month2&&day==day2)&&(this.startTime!=null||this.endTime!=null)&&this.region==null){
+        if (
+          !(year == year2 && month == month2 && day == day2) &&
+          (this.startTime != null || this.endTime != null) &&
+          this.region == null
+        ) {
           // 当不是同一天的时候，直接弹窗警告
           this.startTime = null;
           this.endTime = null;
           this.$message.warning("开始日期和结束日期不是同一天");
         }
         // 判断当前用户选择的具体班次
-        if(this.region == 0){
-          this.startTime = year+"-"+month+"-"+day+" "+"00:00:00";
+        if (this.region == 0) {
+          this.startTime = year + "-" + month + "-" + day + " " + "00:00:00";
           // 将结束时间加一
-          day =parseInt(day) + 1;
-          this.endTime = year+"-"+month+"-"+day+" "+"00:00:00";
-          
-        }else if(this.region == 1){
-          this.startTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          this.endTime = year+"-"+month+"-"+day+" "+"15:30:00";
-        }else if(this.region == 2){
-          this.startTime = year+"-"+month+"-"+day+" "+"15:30:00";
-          this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
-        }else if(this.region == 3){
-          this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
+          day = parseInt(day) + 1;
+          this.endTime = year + "-" + month + "-" + day + " " + "00:00:00";
+        } else if (this.region == 1) {
+          this.startTime = year + "-" + month + "-" + day + " " + "07:30:00";
+          this.endTime = year + "-" + month + "-" + day + " " + "15:30:00";
+        } else if (this.region == 2) {
+          this.startTime = year + "-" + month + "-" + day + " " + "15:30:00";
+          this.endTime = year + "-" + month + "-" + day + " " + "23:30:00";
+        } else if (this.region == 3) {
+          this.endTime = year + "-" + month + "-" + day + " " + "07:30:00";
           // 判断开始日期和结束日期是否跨月份了
-          if(month!=month2){
-            month = parseInt(month)-1
+          if (month != month2) {
+            month = parseInt(month) - 1;
             // 获取前一个月份的最后一天
-            day = this.$options.methods.getdaysinmonth(year,month)
-          }else{
+            day = this.$options.methods.getdaysinmonth(year, month);
+          } else {
             // 将开始时间减一
-            day =parseInt(day)-1;
+            day = parseInt(day) - 1;
           }
-          this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
+          this.startTime = year + "-" + month + "-" + day + " " + "23:30:00";
         }
-        this.startTime = new Date(this.startTime)
-        this.endTime = new Date(this.endTime)
-          console.log(this.startTime+"开始时间")
-          console.log(this.endTime+"结束时间")
+        this.startTime = new Date(this.startTime);
+        this.endTime = new Date(this.endTime);
+        console.log(this.startTime + "开始时间");
+        console.log(this.endTime + "结束时间");
         // 将拼接好的日期转换为时间戳
-        startTime = Date.parse(this.startTime)
-        endTime = Date.parse(this.endTime)
-        console.log(startTime+"开始时间2")
-        console.log(endTime+"结束时间2")
-      }else{
+        startTime = Date.parse(this.startTime);
+        endTime = Date.parse(this.endTime);
+        console.log(startTime + "开始时间2");
+        console.log(endTime + "结束时间2");
+      } else {
         if (this.startTime) {
-        startTime = sjTime(this.startTime);
+          startTime = sjTime(this.startTime);
         }
         if (this.endTime) {
           endTime = sjTime(this.endTime);
@@ -201,11 +220,19 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl =
+            "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId=" +
+            1 +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
-          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else{
-          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }
         } else {
           this.startTime = null;
@@ -213,19 +240,19 @@ export default {
           this.$message.warning("开始时间要比结束时间早");
         }
       } else {
-        this.getRequestUrl()
+        this.getRequestUrl();
       }
     },
     selectionChange(selection) {
       this.options.mapList = selection;
-    },
+    }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
 .steel_inboundStatistics {
-  .sache{
+  .sache {
     height: 5rem;
     display: flex;
     align-items: center;
@@ -241,8 +268,6 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
-
   }
 }
-
-</style>
+</style>

src/views/WMS/components/steel/bar1_steel/inboundEas01.vue

@@ -16,7 +16,12 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" ref="table">
+      <dilTable
+        v-bind.sync="options"
+        ref="table"
+        :showSummaryList="showSummaryList"
+        :isshowSummary="true"
+      >
         <el-table-column label="操作" width="120px">
           <template slot-scope="scope">
             <el-button type="text" @click="crtlZ(scope.row)">撤销</el-button>
@@ -40,7 +45,8 @@ export default {
         requestUrl: "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=" + 1
         // selectionType: "select",
         // mapList: [],
-      }
+      },
+      showSummaryList: ["theroticalWeight", "materialNum", "actuallyWeight"]
     };
   },
   methods: {

src/views/WMS/components/steel/bar2_steel/bar2_addSteelInbound.vue

@@ -15,6 +15,18 @@
       <span class="text">件数：</span>
       <el-input class="input" v-model="materialNumber"> </el-input>
     </div>
+    <div class="materialNumber from">
+      <span class="text">理重(磅重)</span>
+      <el-input class="input" v-model="materialTheWeight" disabled> </el-input>
+    </div>
+    <div class="materialNumber from">
+      <span class="text">实重</span>
+      <el-input class="input" v-model="actuallyWeight"> </el-input>
+    </div>
+    <div class="materialNumber from">
+      <span class="text">备注</span>
+      <el-input class="input" v-model="remark"> </el-input>
+    </div>
     <!-- 模态窗口 -->
     <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
       <div style="margin-bottom: 10px">
@@ -88,7 +100,10 @@ export default {
       second: {
         requestUrl: "",
         selectionType: "radio"
-      }
+      },
+      materialTheWeight: 0,
+      actuallyWeight: 0,
+      remark: null
     };
   },
   watch: {
@@ -96,6 +111,9 @@ export default {
       if (!val) {
         this.input = null;
       }
+    },
+    materialNumber() {
+      this.getTheoreticalByInfo();
     }
   },
   created() {
@@ -104,6 +122,30 @@ export default {
     this.endTime = new Date(this.startTime + 86400000);
   },
   methods: {
+    getTheoreticalByInfo() {
+      this.axios
+        .post(
+          "/api/v1/wms/getTheoreticalByInfo?warehouseId=" +
+            2 +
+            "&materialCode=" +
+            this.materialCode +
+            "&materialSpecification=" +
+            this.materialSpecification +
+            "&materialModel=" +
+            this.materialModel +
+            "&num=" +
+            this.materialNumber +
+            "&status=1"
+        )
+        .then(res => {
+          if (res.data.data == -1) {
+            this.$message.error("数量超出");
+            this.materialTheWeight = null;
+          } else {
+            this.materialTheWeight = parseFloat(res.data.data);
+          }
+        });
+    },
     formatDate(date, fmt) {
       if (/(y+)/.test(fmt)) {
         fmt = fmt.replace(
@@ -189,6 +231,10 @@ export default {
     // 确认
     onClickConfirm() {
       // console.log(this.warehouseId,this.materialCode,this.materialNumber);
+      if (!isNumber(this.actuallyWeight)) {
+        this.$message.error("实重填写不正确");
+        return;
+      }
       this.disabled = true;
       this.axios
         .post(
@@ -201,7 +247,13 @@ export default {
             "&materialModel=" +
             this.materialModel +
             "&quantity=" +
-            this.materialNumber
+            this.materialNumber +
+            "&actuallyWeight=" +
+            Number(parseFloat(this.actuallyWeight)) +
+            "&materialTheWeight=" +
+            Number(parseFloat(this.materialTheWeight)) +
+            "&remark=" +
+            this.remark
         )
         .then(res => {
           console.log(res.data);

src/views/WMS/components/steel/bar2_steel/bar2_steel_inbound.vue

@@ -1,23 +1,47 @@
 //入库
 <template>
-  <div class="steel_inbound">
+  <div class="steel_inbound02">
     <div class="sache">
-      <span>扫码时间：</span>
-      <el-date-picker
-        v-model="startTime"
-        type="datetime"
-        placeholder="选择日期"
-      >
-      </el-date-picker>
-      <span>至</span>
-      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-button type="primary" class="btn" @click="onreserved">
-        入库
-      </el-button>
+      <el-form :inline="true">
+        <el-form-item>
+          <span class="text">入库时间：</span>
+          <el-date-picker
+            disabled
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期"
+            style="width: 200px;"
+          >
+          </el-date-picker>
+          <span class="text">至</span>
+          <el-date-picker
+            disabled
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期"
+            style="width: 200px;"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <span class="text">物资类型</span>
+          <el-autocomplete
+            v-model="inputText"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入内容"
+            @select="handleSelect"
+            style="width: 200px;"
+          ></el-autocomplete>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+          <el-button type="primary" class="btn" @click="onreserved">
+            入库
+          </el-button>
+        </el-form-item>
+      </el-form>
     </div>
     <div class="table">
       <dilTable v-bind.sync="options"> </dilTable>
@@ -88,6 +112,25 @@ export default {
     padLeftZero(str) {
       return ("00" + str).substr(str.length);
     },
+    querySearch(queryString, cb) {
+      var restaurants = [
+        { value: "螺纹钢" },
+        { value: "盘螺" },
+        { value: "乱尺" }
+      ];
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    createFilter(queryString) {
+      return restaurant => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
@@ -112,6 +155,9 @@ export default {
             endTime +
             "&i=" +
             new Date();
+          this.options.requestQuery = {
+            materialNames: this.inputText
+          };
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else{
@@ -139,12 +185,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.steel_inbound {
+.steel_inbound02 {
   .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
   }
 }
 </style>

src/views/WMS/components/steel/bar2_steel/bar2_steel_inboundStatistics.vue

@@ -3,7 +3,11 @@
   <div class="steel_inboundStatistics">
     <div class="sache">
       <span>入库时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
       </el-date-picker>
       <span>至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
@@ -17,18 +21,23 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-col :span="3" v-html="'\u2003'"/>
+      <el-col :span="3" v-html="'\u2003'" />
       <span>生产总件数</span>
       <el-input
         placeholder="请输入内容"
         v-model="input3"
-        :disabled="true" class="inputs" style="width:10%">
+        :disabled="true"
+        class="inputs"
+        style="width:10%"
+      >
       </el-input>
       <span>生产总重量</span>
       <el-input
         placeholder="请输入内容"
         v-model="input4"
-        :disabled="true" style="width:10%">
+        :disabled="true"
+        style="width:10%"
+      >
       </el-input>
     </div>
     <div class="table">
@@ -40,51 +49,51 @@
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from '@/utils/util.js';
+import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-      rowClassName({row, rowIndex}) {
+  data() {
+    return {
+      rowClassName({ row, rowIndex }) {
         if (rowIndex === 0) {
-          return 'success-row';
+          return "success-row";
         }
-        return '';
+        return "";
       },
-      input1: '',
-      input2: '',
-      input3: '',
-      input4: '',
-      input5: '',
-      inputText:"",
+      input1: "",
+      input2: "",
+      input3: "",
+      input4: "",
+      input5: "",
+      inputText: "",
       startTime: null,
       endTime: null,
       region: "0",
-      options:{
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+2,
+        requestUrl:
+          "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId=" + 2
         // selectionType: "select",
         // mapList: [],
-      },
-    }
+      }
+    };
   },
-  created(){
-    console.log(this.options.data)
+  created() {
+    console.log(this.options.data);
   },
-  methods:{
-    func(res){
+  methods: {
+    func(res) {
       // console.log(res.list[0])
       // this.input1 = this.input1 + e.furnaceNumber1,
       let num1 = 0;
       let num2 = 0;
       res.list.forEach(e => {
-        console.log(e)
-        console.log(e.count)
-        console.log(e.weight)
-        num1 = num1 + e.count,
-        num2 = num2 + e.weight
+        console.log(e);
+        console.log(e.count);
+        console.log(e.weight);
+        (num1 = num1 + e.count), (num2 = num2 + e.weight);
       });
       this.input3 = num1;
-      this.input4 = num2;
+      this.input4 = (num2 / 1000).toFixed(3);
       // this.input1 = res.list[0].furnaceNumber1,
       // this.input2 = res.list[0].materialName,
       // this.input3 = res.list[0].count,
@@ -95,53 +104,60 @@ export default {
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     // 获取当前月份的最后一天
-    getdaysinmonth(year,month){
-      month = parseInt(month,10)+1;
+    getdaysinmonth(year, month) {
+      month = parseInt(month, 10) + 1;
       let days = 0;
-      month = month -1;
-      console.log("othermonth"+month)
-      console.log("otheryear"+year);
+      month = month - 1;
+      console.log("othermonth" + month);
+      console.log("otheryear" + year);
       // 根据月份获取对应的天数
-      if(month == 2){
-        days = year % 4 == 0?29:28;
-      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+      if (month == 2) {
+        days = year % 4 == 0 ? 29 : 28;
+      } else if (
+        month == 1 ||
+        month == 3 ||
+        month == 5 ||
+        month == 7 ||
+        month == 8 ||
+        month == 10 ||
+        month == 12
+      ) {
         days = 31;
-      }else{
+      } else {
         days = 30;
       }
-      console.log("otherdays"+days)
+      console.log("otherdays" + days);
       return days;
     },
-    onclick(){
-
+    onclick() {
       let startTime = null;
       let endTime = null;
       // 判断用户有没有班次，有班次则提供默认时间
-      if(this.region!=null){
-        let date =null;
-        let date2 =null;
+      if (this.region != null) {
+        let date = null;
+        let date2 = null;
         let year = null;
-        let month =null;
+        let month = null;
         let day = null;
         let year2 = null;
-        let month2 =null;
+        let month2 = null;
         let day2 = null;
         // 判断当前日期输入框中是否选择了时间,并且开始日期和结束日期是否是同一天
-        if(this.startTime!=null){
-            date = this.startTime;
-            // 判断当前开始时间是标准时间还是字符串时间
-            
-           year = date.getFullYear(); // 年
+        if (this.startTime != null) {
+          date = this.startTime;
+          // 判断当前开始时间是标准时间还是字符串时间
+
+          year = date.getFullYear(); // 年
           month = date.getMonth() + 1; // 月
-          day = date.getDate(); // 日 
+          day = date.getDate(); // 日
         }
-        if(this.endTime!=null){
-           date2 = this.endTime;
-           year2 = date2.getFullYear(); // 年
+        if (this.endTime != null) {
+          date2 = this.endTime;
+          year2 = date2.getFullYear(); // 年
           month2 = date2.getMonth() + 1; // 月
           day2 = date2.getDate(); // 日 // 日
         }
-        if(this.startTime==null&&this.endTime==null){
+        if (this.startTime == null && this.endTime == null) {
           // 获取当前的日期时间
           date = new Date();
           year = date.getFullYear(); // 年
@@ -149,50 +165,53 @@ export default {
           day = date.getDate(); // 日
         }
         // 判断开始日期和结束日期是否是同一天
-        if(!(year==year2&&month==month2&&day==day2)&&(this.startTime!=null||this.endTime!=null)&&this.region==null){
+        if (
+          !(year == year2 && month == month2 && day == day2) &&
+          (this.startTime != null || this.endTime != null) &&
+          this.region == null
+        ) {
           // 当不是同一天的时候，直接弹窗警告
           this.startTime = null;
           this.endTime = null;
           this.$message.warning("开始日期和结束日期不是同一天");
         }
         // 判断当前用户选择的具体班次
-        if(this.region == 0){
-          this.startTime = year+"-"+month+"-"+day+" "+"00:00:00";
+        if (this.region == 0) {
+          this.startTime = year + "-" + month + "-" + day + " " + "00:00:00";
           // 将结束时间加一
-          day =parseInt(day) + 1;
-          this.endTime = year+"-"+month+"-"+day+" "+"00:00:00";
-          
-        }else if(this.region == 1){
-          this.startTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          this.endTime = year+"-"+month+"-"+day+" "+"15:30:00";
-        }else if(this.region == 2){
-          this.startTime = year+"-"+month+"-"+day+" "+"15:30:00";
-          this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
-        }else if(this.region == 3){
-          this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
+          day = parseInt(day) + 1;
+          this.endTime = year + "-" + month + "-" + day + " " + "00:00:00";
+        } else if (this.region == 1) {
+          this.startTime = year + "-" + month + "-" + day + " " + "07:30:00";
+          this.endTime = year + "-" + month + "-" + day + " " + "15:30:00";
+        } else if (this.region == 2) {
+          this.startTime = year + "-" + month + "-" + day + " " + "15:30:00";
+          this.endTime = year + "-" + month + "-" + day + " " + "23:30:00";
+        } else if (this.region == 3) {
+          this.endTime = year + "-" + month + "-" + day + " " + "07:30:00";
           // 判断开始日期和结束日期是否跨月份了
-          if(month!=month2){
-            month = parseInt(month)-1
+          if (month != month2) {
+            month = parseInt(month) - 1;
             // 获取前一个月份的最后一天
-            day = this.$options.methods.getdaysinmonth(year,month)
-          }else{
+            day = this.$options.methods.getdaysinmonth(year, month);
+          } else {
             // 将开始时间减一
-            day =parseInt(day)-1;
+            day = parseInt(day) - 1;
           }
-          this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
+          this.startTime = year + "-" + month + "-" + day + " " + "23:30:00";
         }
-        this.startTime = new Date(this.startTime)
-        this.endTime = new Date(this.endTime)
-          console.log(this.startTime+"开始时间")
-          console.log(this.endTime+"结束时间")
+        this.startTime = new Date(this.startTime);
+        this.endTime = new Date(this.endTime);
+        console.log(this.startTime + "开始时间");
+        console.log(this.endTime + "结束时间");
         // 将拼接好的日期转换为时间戳
-        startTime = Date.parse(this.startTime)
-        endTime = Date.parse(this.endTime)
-        console.log(startTime+"开始时间2")
-        console.log(endTime+"结束时间2")
-      }else{
+        startTime = Date.parse(this.startTime);
+        endTime = Date.parse(this.endTime);
+        console.log(startTime + "开始时间2");
+        console.log(endTime + "结束时间2");
+      } else {
         if (this.startTime) {
-        startTime = sjTime(this.startTime);
+          startTime = sjTime(this.startTime);
         }
         if (this.endTime) {
           endTime = sjTime(this.endTime);
@@ -201,11 +220,19 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+2+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl =
+            "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId=" +
+            2 +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
-          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else{
-          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }
         } else {
           this.startTime = null;
@@ -213,19 +240,19 @@ export default {
           this.$message.warning("开始时间要比结束时间早");
         }
       } else {
-        this.getRequestUrl()
+        this.getRequestUrl();
       }
     },
     selectionChange(selection) {
       this.options.mapList = selection;
-    },
+    }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
 .steel_inboundStatistics {
-  .sache{
+  .sache {
     height: 5rem;
     display: flex;
     align-items: center;
@@ -241,8 +268,6 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
-
   }
 }
-
-</style>
+</style>

src/views/WMS/components/steel/bar2_steel/inboundEas02.vue

@@ -16,7 +16,12 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" ref="table">
+      <dilTable
+        v-bind.sync="options"
+        ref="table"
+        :showSummaryList="showSummaryList"
+        :isshowSummary="true"
+      >
         <el-table-column label="操作" width="120px">
           <template slot-scope="scope">
             <el-button type="text" @click="crtlZ(scope.row)">撤销</el-button>
@@ -40,7 +45,8 @@ export default {
         requestUrl: "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=" + 2
         // selectionType: "select",
         // mapList: [],
-      }
+      },
+      showSummaryList: ["theroticalWeight", "materialNum", "actuallyWeight"]
     };
   },
   methods: {

src/views/WMS/components/steel/inboundEas03.vue

@@ -16,7 +16,12 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" ref="table">
+      <dilTable
+        v-bind.sync="options"
+        ref="table"
+        :showSummaryList="showSummaryList"
+        :isshowSummary="true"
+      >
         <el-table-column label="操作" width="120px">
           <template slot-scope="scope"
             ><el-button type="text" @click="crtlZ(scope.row)"
@@ -42,7 +47,8 @@ export default {
         requestUrl: "/api/v1/wms/getInboundEasInfo?apiId=510&warehouseId=" + 3
         // selectionType: "select",
         // mapList: [],
-      }
+      },
+      showSummaryList: ["theroticalWeight", "materialNum", "actuallyWeight"]
     };
   },
   methods: {

src/views/WMS/components/steel/steel_inbound.vue

@@ -1,37 +1,47 @@
 //入库转预留
 <template>
-  <div class="steel_inbound">
+  <div class="steel_inbound03">
     <div class="sache">
-      <span class="text">入库时间：</span>
-      <el-date-picker
-        disabled
-        v-model="startTime"
-        type="datetime"
-        placeholder="选择日期"
-      >
-      </el-date-picker>
-      <span class="text">至</span>
-      <el-date-picker
-        disabled
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期"
-      >
-      </el-date-picker>
-      <span class="text">物资类型</span>
-      <el-autocomplete
-        class="inputStyle"
-        v-model="inputText"
-        :fetch-suggestions="querySearch"
-        placeholder="请输入内容"
-        @select="handleSelect"
-      ></el-autocomplete>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-button type="primary" class="btn" @click="onreserved">
-        入库
-      </el-button>
+      <el-form :inline="true">
+        <el-form-item>
+          <span class="text">扫码时间：</span>
+          <el-date-picker
+            disabled
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期"
+            style="width: 200px;"
+          >
+          </el-date-picker>
+          <span class="text">至</span>
+          <el-date-picker
+            disabled
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期"
+            style="width: 200px;"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <span class="text">物资类型</span>
+          <el-autocomplete
+            v-model="inputText"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入内容"
+            @select="handleSelect"
+            style="width: 200px;"
+          ></el-autocomplete>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+          <el-button type="primary" class="btn" @click="onreserved">
+            入库
+          </el-button>
+        </el-form-item>
+      </el-form>
     </div>
     <div class="table">
       <dilTable
@@ -46,7 +56,6 @@
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
@@ -123,8 +132,7 @@ export default {
     createFilter(queryString) {
       return restaurant => {
         return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1
         );
       };
     },
@@ -181,36 +189,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.steel_inbound {
-  margin-top: 30px;
-  margin-left: 20px;
-
+.steel_inbound03 {
   .sache {
-    display: flex;
-    margin-bottom: 10px;
-    padding-right: 10px;
-    .inputStyle {
-      width: 200px;
-      margin-right: 5px;
-      margin-left: 5px;
-    }
-    .text {
-      text-align: left;
-      line-height: 40px;
-    }
-    .el-date-editor {
-      margin-right: 5px;
-      margin-left: 5px;
-    }
-    .btn {
-      margin-left: 10px;
-    }
-    .el-select {
-      width: 100%;
-      .el-input__inner {
-        width: 150px;
-      }
-    }
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
   }
 }
 </style>

src/views/WMS/components/steel/steel_inboundStatistics.vue

@@ -3,7 +3,11 @@
   <div class="steel_inboundStatistics">
     <div class="sache">
       <span class="text">入库时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
       </el-date-picker>
       <span class="text1">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
@@ -17,18 +21,23 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-col :span="3" v-html="'\u2003'"/>
+      <el-col :span="3" v-html="'\u2003'" />
       <span class="text">生产总件数</span>
       <el-input
         placeholder="请输入内容"
         v-model="input3"
-        :disabled="true" class="inputs" style="width:10%">
+        :disabled="true"
+        class="inputs"
+        style="width:10%"
+      >
       </el-input>
       <span class="text">生产总重量</span>
       <el-input
         placeholder="请输入内容"
         v-model="input4"
-        :disabled="true" style="width:10%">
+        :disabled="true"
+        style="width:10%"
+      >
       </el-input>
     </div>
     <div class="table">
@@ -40,51 +49,52 @@
 
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import { getCookie } from '@/utils/util.js';
+import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-      rowClassName({row, rowIndex}) {
+  data() {
+    return {
+      rowClassName({ row, rowIndex }) {
         if (rowIndex === 0) {
-          return 'success-row';
+          return "success-row";
         }
-        return '';
+        return "";
       },
-      input1: '',
-      input2: '',
-      input3: '',
-      input4: '',
-      input5: '',
-      inputText:"",
+      input1: "",
+      input2: "",
+      input3: "",
+      input4: "",
+      input5: "",
+      inputText: "",
       startTime: null,
       endTime: null,
       region: "0",
-      options:{
+      options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3,
+        requestUrl:
+          "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId=" + 3
         // selectionType: "select",
         // mapList: [],
-      },
-    }
+      }
+    };
   },
-  created(){
-    console.log(this.options.data)
+  created() {
+    console.log(this.options.data);
   },
-  methods:{
-    func(res){
+  methods: {
+    func(res) {
       // console.log(res.list[0])
       // this.input1 = this.input1 + e.furnaceNumber1,
       let num1 = 0;
       let num2 = 0;
       res.list.forEach(e => {
-        console.log(e)
-        console.log(e.count)
-        console.log(e.weight)
-        num1 = num1 + e.count,
-        num2 = num2 + e.weight
+        console.log(e);
+        console.log(e.count);
+        console.log(e.weight);
+        num1 = num1 + e.count;
+        num2 = num2 + e.weight;
       });
       this.input3 = num1;
-      this.input4 = num2;
+      this.input4 = (num2 / 1000).toFixed(3);
       // this.input1 = res.list[0].furnaceNumber1,
       // this.input2 = res.list[0].materialName,
       // this.input3 = res.list[0].count,
@@ -95,53 +105,60 @@ export default {
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     // 获取当前月份的最后一天
-    getdaysinmonth(year,month){
-      month = parseInt(month,10)+1;
+    getdaysinmonth(year, month) {
+      month = parseInt(month, 10) + 1;
       let days = 0;
-      month = month -1;
-      console.log("othermonth"+month)
-      console.log("otheryear"+year);
+      month = month - 1;
+      console.log("othermonth" + month);
+      console.log("otheryear" + year);
       // 根据月份获取对应的天数
-      if(month == 2){
-        days = year % 4 == 0?29:28;
-      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+      if (month == 2) {
+        days = year % 4 == 0 ? 29 : 28;
+      } else if (
+        month == 1 ||
+        month == 3 ||
+        month == 5 ||
+        month == 7 ||
+        month == 8 ||
+        month == 10 ||
+        month == 12
+      ) {
         days = 31;
-      }else{
+      } else {
         days = 30;
       }
-      console.log("otherdays"+days)
+      console.log("otherdays" + days);
       return days;
     },
-    onclick(){
-
+    onclick() {
       let startTime = null;
       let endTime = null;
       // 判断用户有没有班次，有班次则提供默认时间
-      if(this.region!=null){
-        let date =null;
-        let date2 =null;
+      if (this.region != null) {
+        let date = null;
+        let date2 = null;
         let year = null;
-        let month =null;
+        let month = null;
         let day = null;
         let year2 = null;
-        let month2 =null;
+        let month2 = null;
         let day2 = null;
         // 判断当前日期输入框中是否选择了时间,并且开始日期和结束日期是否是同一天
-        if(this.startTime!=null){
-            date = this.startTime;
-            // 判断当前开始时间是标准时间还是字符串时间
-            
-           year = date.getFullYear(); // 年
+        if (this.startTime != null) {
+          date = this.startTime;
+          // 判断当前开始时间是标准时间还是字符串时间
+
+          year = date.getFullYear(); // 年
           month = date.getMonth() + 1; // 月
-          day = date.getDate(); // 日 
+          day = date.getDate(); // 日
         }
-        if(this.endTime!=null){
-           date2 = this.endTime;
-           year2 = date2.getFullYear(); // 年
+        if (this.endTime != null) {
+          date2 = this.endTime;
+          year2 = date2.getFullYear(); // 年
           month2 = date2.getMonth() + 1; // 月
           day2 = date2.getDate(); // 日 // 日
         }
-        if(this.startTime==null&&this.endTime==null){
+        if (this.startTime == null && this.endTime == null) {
           // 获取当前的日期时间
           date = new Date();
           year = date.getFullYear(); // 年
@@ -149,50 +166,53 @@ export default {
           day = date.getDate(); // 日
         }
         // 判断开始日期和结束日期是否是同一天
-        if(!(year==year2&&month==month2&&day==day2)&&(this.startTime!=null||this.endTime!=null)&&this.region==null){
+        if (
+          !(year == year2 && month == month2 && day == day2) &&
+          (this.startTime != null || this.endTime != null) &&
+          this.region == null
+        ) {
           // 当不是同一天的时候，直接弹窗警告
           this.startTime = null;
           this.endTime = null;
           this.$message.warning("开始日期和结束日期不是同一天");
         }
         // 判断当前用户选择的具体班次
-        if(this.region == 0){
-          this.startTime = year+"-"+month+"-"+day+" "+"00:00:00";
+        if (this.region == 0) {
+          this.startTime = year + "-" + month + "-" + day + " " + "00:00:00";
           // 将结束时间加一
-          day =parseInt(day) + 1;
-          this.endTime = year+"-"+month+"-"+day+" "+"00:00:00";
-          
-        }else if(this.region == 1){
-          this.startTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          this.endTime = year+"-"+month+"-"+day+" "+"15:30:00";
-        }else if(this.region == 2){
-          this.startTime = year+"-"+month+"-"+day+" "+"15:30:00";
-          this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
-        }else if(this.region == 3){
-          this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
+          day = parseInt(day) + 1;
+          this.endTime = year + "-" + month + "-" + day + " " + "00:00:00";
+        } else if (this.region == 1) {
+          this.startTime = year + "-" + month + "-" + day + " " + "07:30:00";
+          this.endTime = year + "-" + month + "-" + day + " " + "15:30:00";
+        } else if (this.region == 2) {
+          this.startTime = year + "-" + month + "-" + day + " " + "15:30:00";
+          this.endTime = year + "-" + month + "-" + day + " " + "23:30:00";
+        } else if (this.region == 3) {
+          this.endTime = year + "-" + month + "-" + day + " " + "07:30:00";
           // 判断开始日期和结束日期是否跨月份了
-          if(month!=month2){
-            month = parseInt(month)-1
+          if (month != month2) {
+            month = parseInt(month) - 1;
             // 获取前一个月份的最后一天
-            day = this.$options.methods.getdaysinmonth(year,month)
-          }else{
+            day = this.$options.methods.getdaysinmonth(year, month);
+          } else {
             // 将开始时间减一
-            day =parseInt(day)-1;
+            day = parseInt(day) - 1;
           }
-          this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
+          this.startTime = year + "-" + month + "-" + day + " " + "23:30:00";
         }
-        this.startTime = new Date(this.startTime)
-        this.endTime = new Date(this.endTime)
-          console.log(this.startTime+"开始时间")
-          console.log(this.endTime+"结束时间")
+        this.startTime = new Date(this.startTime);
+        this.endTime = new Date(this.endTime);
+        console.log(this.startTime + "开始时间");
+        console.log(this.endTime + "结束时间");
         // 将拼接好的日期转换为时间戳
-        startTime = Date.parse(this.startTime)
-        endTime = Date.parse(this.endTime)
-        console.log(startTime+"开始时间2")
-        console.log(endTime+"结束时间2")
-      }else{
+        startTime = Date.parse(this.startTime);
+        endTime = Date.parse(this.endTime);
+        console.log(startTime + "开始时间2");
+        console.log(endTime + "结束时间2");
+      } else {
         if (this.startTime) {
-        startTime = sjTime(this.startTime);
+          startTime = sjTime(this.startTime);
         }
         if (this.endTime) {
           endTime = sjTime(this.endTime);
@@ -201,11 +221,19 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl =
+            "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId=" +
+            3 +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
-          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else{
-          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResultStatistics?apiId=445&warehouseId="+3+"&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }
         } else {
           this.startTime = null;
@@ -216,42 +244,41 @@ export default {
     },
     selectionChange(selection) {
       this.options.mapList = selection;
-    },
+    }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
 .steel_inboundStatistics {
-    margin-top: 30px;
-    margin-left: 20px;
-    .sache{
-      display: flex;
-      margin-bottom: 10px;
-      padding-right: 10px;
-      .text {
-        text-align: left;
-        line-height: 40px;
-        width: 70px;
-      }
-      .text1 {
-        text-align: left;
-        line-height: 40px;
-      }
-      .el-date-editor {
-        margin-right: 5px;
-        margin-left: 5px;
-      }
-      .btn {
-        margin-left: 10px;
-      }
-      .el-select {
+  margin-top: 30px;
+  margin-left: 20px;
+  .sache {
+    display: flex;
+    margin-bottom: 10px;
+    padding-right: 10px;
+    .text {
+      text-align: left;
+      line-height: 40px;
+      width: 70px;
+    }
+    .text1 {
+      text-align: left;
+      line-height: 40px;
+    }
+    .el-date-editor {
+      margin-right: 5px;
+      margin-left: 5px;
+    }
+    .btn {
+      margin-left: 10px;
+    }
+    .el-select {
       width: 100%;
       .el-input__inner {
         width: 150px;
       }
     }
-    }
+  }
 }
-
-</style>
+</style>

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

@@ -134,6 +134,8 @@ export default {
       selectionList: [],
       //区别点击的是添加运力，还是修改
       index: null
+      // wssUrl: "wss:wl.dasteel.cn:32322/websocket/socketServer",
+      // actiones: { username: "湘M99999" } //传入后台的数据
     };
   },
   created() {
@@ -180,8 +182,51 @@ export default {
       this.dispatched.requestUrl =
         "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3";
     }
+    // this.initWebSocket();
   },
   methods: {
+    //建立websocket连接
+    initWebSocket() {
+      //试图调用websocket
+      //初始化weosocket
+      const wssUrl = this.wssUrl;
+      this.websock = new WebSocket(wssUrl);
+      this.websock.onmessage = this.websocketonmessage;
+      this.websock.onopen = this.websocketonopen;
+      this.websock.onerror = this.websocketonerror;
+      // this.websock.onclose = this.websocketclose;
+    },
+    //发送数据
+    websocketonopen() {
+      this.websocketsend();
+    },
+    //接收数据
+    websocketonmessage(e) {
+      console.log("收到信息");
+      let data = e.data;
+      console.log(data);
+      let websocketKey = data.messageContent;
+      let userName = "湘M99999";
+      let message =
+        "{'messageContent': '" +
+        websocketKey +
+        ":" +
+        userName +
+        "','messageType':1,'receivePerson': 'app','sendPerson': 'self'}";
+      this.websocketsend(message);
+    },
+    //连接建立失败重连
+    websocketonerror() {
+      this.initWebSocket();
+    },
+    //发送数据
+    websocketsend(message) {
+      this.websock.send({ message, async success() {} });
+    },
+    //关闭连接
+    websocketclose(e) {
+      console.log("断开连接", e);
+    },
     continueDispatch(scope) {
       this.$router.push("/addPurInwardOrderCon/" + scope.row.planId);
     },

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() {