【nev】暂存

fe/PC/src/utils/detailsTableColumns/index.js

@@ -4975,7 +4975,7 @@ export const KittingIssueRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
+  { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
   { label: "单位", prop: "uom" },
   { label: "数量", prop: "qty" },
   { label: "申请数量", prop: 'issuedQty' },

fe/PC/src/utils/tableColumns/index.js

@@ -4173,9 +4173,9 @@ export const PositionCode = [
   { label: _Names.itemDesc1, prop: "partDesc" },
   // { label: _Names.itemDesc2, prop: "desc2" },
   { label: _Names.basicUom, prop: "basicUom" },
-  { label: _Names.stdPackQty, prop: "stdPackQty",isNumber:true },
+  { label: "箱数/数量", prop: "stdPackQty",isNumber:true },
-  { label: "叫料库位代码", prop: "locationCode" },
+  { label: "目标库位代码", prop: "locationCode" },
-  { label: "叫料库位名称", prop: "locationName" },
+  { label: "目标库位名称", prop: "locationName" },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
   { label: _Public.remark, prop: "remark" },

fe/PC/src/utils/tabsDesTions/index.js

@@ -3016,9 +3016,9 @@ export const PositionCode = [
   { label: _Names.itemDesc1, prop: "partDesc" },
   // { label: _Names.itemDesc2, prop: "desc2" },
   { label: _Names.basicUom, prop: "basicUom" },
-  { label: _Names.stdPackQty, prop: "stdPackQty" },
+  { label: "箱数/数量", prop: "stdPackQty" },
-  { label: "叫料库位代码", prop: "locationCode" },
+  { label: "目标库位代码", prop: "locationCode" },
-  { label: "叫料库位名称", prop: "locationName" },
+  { label: "目标库位名称", prop: "locationName" },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
   { label: _Public.remark, prop: "remark" },

fe/PC/src/views/basicData/ItemsManage/PositionCode.vue

@@ -161,7 +161,7 @@ export default {
       CreateForm: [
         { type: "select", label: "类型", prop: "type", colSpan: 12 ,options:'positionCodeType' },
         { type: "prefixInput", label: "位置码",validType:'numberLetter', prop: "codeSuffix",prefixProp:"codeType",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 },
-        { type: "inputNumber", label: "标包数量", prop: "stdPackQty", colSpan: 12, min:1 },
+        { type: "inputNumber", label: "箱数/数量", prop: "stdPackQty", colSpan: 12, min:1 },
         { type: "filterSelect", label: "物品代码", prop: "partCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, 
@@ -170,18 +170,18 @@ export default {
         { type: "input", disabled:true, label: "物品名称", prop: "partName",colSpan: 12 },
         { type: "input", disabled:true, label: "物品描述", prop: "partDesc",colSpan: 12 },
         { type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 },
-        { type: "filterSelect", label: "叫料库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "目标库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, 
           colSpan: 12 
         },
-        { type: "input", disabled:true, label: "叫料库位名称", prop: "locationName",colSpan: 12 },
+        { type: "input", disabled:true, label: "目标库位名称", prop: "locationName",colSpan: 12 },
         { type: "input", label: "备注", prop: "remark",colSpan: 12 },
       ],
       editForm: [
         { type: "select",disabled:true, label: "类型", prop: "type", colSpan: 12 ,options:'positionCodeType' },
         { disabled:true,type: "prefixInput", label: "位置码", prop: "codeSuffix",prefixProp:"codeType",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 },
-        { type: "inputNumber", label: "标包数量", prop: "stdPackQty", colSpan: 12, min:1 },
+        { type: "inputNumber", label: "箱数/数量", prop: "stdPackQty", colSpan: 12, min:1 },
         { type: "filterSelect", label: "物品代码", prop: "partCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, 
@@ -190,12 +190,12 @@ export default {
         { type: "input", disabled:true, label: "物品名称", prop: "partName",colSpan: 12 },
         { type: "input", disabled:true, label: "物品描述", prop: "partDesc",colSpan: 12 },
         { type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 },
-        { type: "filterSelect", label: "叫料库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "目标库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, 
           colSpan: 12 
         },
-        { type: "input", disabled:true, label: "叫料库位名称", prop: "locationName",colSpan: 12 },
+        { type: "input", disabled:true, label: "目标库位名称", prop: "locationName",colSpan: 12 },
         { type: "input", label: "备注", prop: "remark",colSpan: 12 },
       ],
       editRules: {
@@ -295,7 +295,7 @@ export default {
             this.editFormData.codeType = 'Z'
             break;
           case 4:
-            this.CreateFormData.codeType = 'K'
+            this.editFormData.codeType = 'K'
             break;
           default:
             this.editFormData.codeType = ''

fe/PC/src/views/login/index.vue

@@ -137,6 +137,7 @@ export default {
     });
   },
   mounted () {
+    window.showInfoFromJava = this.showInfoFromJava(111)
     if (this.loginForm.username === '') {
       this.$refs.username.focus()
     } else if (this.loginForm.password === '') {
@@ -147,6 +148,10 @@ export default {
     // window.removeEventListener('storage', this.afterQRScan)
   },
   methods: {
+    showInfoFromJava(msg){
+      console.log("showInfoFromJava")
+      alert(msg)
+    },
     checkCapslock (e) {
       const { key } = e
       this.capsTooltip = key && key.length === 1 && (key >= 'A' && key <= 'Z')

fe/PC/src/views/padManage/padKittingPack.vue

@@ -0,0 +1,156 @@
+<template>
+  <div class="page-box padKittingPackPage" v-loading="loading">
+    <!-- 左侧按钮 -->
+    <div class="leftBtns">
+      <div 
+        v-for="(item,index) of leftButtons" 
+        :key="index"
+        class="left-button"
+      >{{ item.name }}</div>
+    </div>
+    <!-- 中间底盘号 -->
+    <div class="centerChassisContain">
+      <div class="title">底盘号</div>
+      <ul class="chassisList">
+        <li
+          v-for="(item,index) of centerChassisList" 
+          :style="{color:(item.canSelect?'#000':'#ddd'),cursor:(item.canSelect?'pointer':'no-drop'),background:(item.isSelect?'green':'#fff')}"
+          :key="index"
+          @click="selectCenterChassis(item,index)"
+        >{{ item.number }}{{item.canSelect}}{{item.isSelect}}</li>
+      </ul>
+      <div class="footer-button">创建底盘组</div>
+    </div>
+    <!-- 右侧底盘组 -->
+    <div class="rightChassisGroup">
+      <!-- 右上组 -->
+      <div class="rightTopTable">
+        <el-table
+          :data="rightTopChassisGroup"
+          style="width: 100%">
+          <el-table-column
+            prop="number"
+            label="组"
+          ></el-table-column>
+          <el-table-column
+            prop="time"
+            label="时间"
+          ></el-table-column>
+        </el-table>
+      </div>
+      <!-- 右下bom -->
+      <div class="rightBottomBomData">
+        <el-table
+          :data="rightBottomBomData"
+          style="width: 100%">
+          <el-table-column
+            prop="name"
+            label="Kitting组别Bom"
+          ></el-table-column>
+          <el-table-column
+            prop="qty"
+            label="底盘组物品数量"
+          ></el-table-column>
+          <el-table-column
+            prop="qty1"
+            label="Kiting组数量"
+          ></el-table-column>
+        </el-table>
+      </div>
+      <div class="footer-button">完成该组底盘</div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "padKittingPack",
+  data() {
+    return {
+      loading:false,
+      // 默认一次打包数量
+      packGroupNumber:3,
+      // 左侧按钮
+      leftButtons:[
+        {name:'K1',id:'1'},
+        {name:'K2',id:'2'},
+        {name:'K3',id:'3'},
+        {name:'K4',id:'4'},
+        {name:'K5',id:'5'},
+      ],
+      // 中间底盘号
+      centerChassisList:[
+        {number:'BC0000004',id:'4',time:'09:00:00',canSelect:true,isSelect:false},
+        {number:'BC0000005',id:'5',time:'09:00:00',canSelect:false,isSelect:false},
+        {number:'BC0000006',id:'6',time:'09:00:00',canSelect:false,isSelect:false},
+        {number:'BC0000007',id:'7',time:'09:00:00',canSelect:false,isSelect:false},
+      ],
+      // 右上方组数据
+      rightTopChassisGroup:[
+        {number:'BC0000001',id:'1',time:'09:00:00'},
+        {number:'BC0000002',id:'2',time:'09:00:00'},
+        {number:'BC0000003',id:'3',time:'09:00:00'},
+      ],
+      // 右下方组bom数据
+      rightBottomBomData:[
+        {name:'SE370E01B01A',qty:'1',qty2:'1'},
+        {name:'SE370Q41B10AG',qty:'2',qty2:'2'},
+        {name:'THILDD0A510AA',qty:'3',qty2:'3'},
+      ],
+    };
+  },
+  methods:{
+    // 点击选中中间数据
+    selectCenterChassis(selectItem,selectIndex){
+      this.centerChassisList.forEach((item,index)=>{
+        // 如果当前项为第一个 或者 前一个已经选中
+        if(Number(selectIndex) == 0 || this.centerChassisList[Number(selectIndex)-1].isSelect){
+          // // 选中
+          if(selectItem.isSelect == false){
+            console.log(109,this.centerChassisList[Number(selectIndex)].isSelect)
+            this.centerChassisList[Number(selectIndex)].isSelect = true
+            this.centerChassisList[Number(selectIndex)].canSelect = true
+            if(this.centerChassisList[Number(selectIndex + 1)]){
+              this.centerChassisList[Number(selectIndex + 1)].canSelect = true
+            }
+            // if(Number(index) <= Number(selectIndex))item.isSelect = true
+            // if(Number(index) <= Number(selectIndex + 1))item.canSelect = true
+            // if(Number(selectIndex) == this.centerChassisList.length - 1){
+            //   item.isSelect = true
+            // }
+          }
+          // 取消选中todo:
+          else{
+            console.log(123)
+            if(Number(index) == Number(selectIndex)){
+              item.isSelect = false
+            }
+            // console.log(120,index,selectIndex)
+            // if(Number(index) > Number(selectIndex)){
+            //   item.canSelect = false
+            //   item.isSelect = false
+            // }
+          }
+          // if(selectIndex == this.centerChassisList.length - 1){
+          //   item.canSelect = true
+          // }else{
+          //   this.centerChassisList[Number(selectIndex)+1].canSelect = true
+          // }
+        }else{
+          this.$warningMsg("必须从上按顺序选择")
+        }
+        // if(selectItem.isSelect){
+        //   if(Number(index) > Number(selectIndex)){
+        //     item.canSelect = false
+        //     item.isSelect = false
+        //   }
+        // }
+      })
+    }
+  },
+  mounted() {
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/styles/mainbasicData.scss";
+</style>