'更新'

src/lang/i18n/en/module/basicData.js

@@ -1,13 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-11 11:13:47
-=======
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-12 14:22:52
->>>>>>> develop
+ * @LastEditTime: 2022-03-14 16:22:38
  * @Description: file content
  */
 export default {
@@ -186,7 +181,10 @@ export default {
     remark: 'Remark',
     PositionNo: 'PositionNo',
     PositionCode: 'PositionCode',
-    PositionCodeAlias: 'PositionCodeAlias'
+    PositionCodeAlias: 'PositionCodeAlias',
+    scrapped: 'Scrapped',
+    normal: 'Normal',
+    repairing: 'Repairing'
   },
   equipment: {
     EquipmentName: 'Equipment Name',

src/lang/i18n/zh/module/basicData.js

@@ -1,14 +1,9 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-11 11:13:22
+ * @LastEditTime: 2022-03-14 16:22:20
  * @Description: file content
-=======
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-12 14:23:06
->>>>>>> develop
  */
 export default {
   visual: {
@@ -177,7 +172,11 @@ export default {
     remark: '备注',
     PositionNo: '位置序号',
     PositionCode: '位置编码',
-    PositionCodeAlias: '位置编码别名'
+    PositionCodeAlias: '位置编码别名',
+    scrapped: '报废',
+    normal: '正常',
+    repairing: '维修中'
+
   },
   equipment: {
     shortName: '名称缩写',

src/views/basicData/Cache/components/locationAttr-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-11 11:03:31
+ * @LastEditTime: 2022-03-14 16:37:47
  * @Description:
 -->
 <template>
@@ -20,11 +20,14 @@
       <el-form-item :label="$t('module.basicData.cache.anotherName')" prop="locationNameAlias">
         <el-input v-model="dataForm.locationNameAlias" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.anotherName')])" clearable />
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
+      <!-- <el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
         <el-input v-model="dataForm.layers" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowMark')])" clearable />
+      </el-form-item> -->
+      <el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
+        <el-input-number v-model="dataForm.layers" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowMark')])" clearable />
       </el-form-item>
       <el-form-item :label="$t('module.basicData.cache.columnMark')" prop="columns">
-        <el-input v-model="dataForm.columns" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
+        <el-input-number v-model="dataForm.columns" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
       </el-form-item>
       <!-- <el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
         <el-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
@@ -71,8 +74,6 @@ export default {
         code: '',
         locationNameAlias: '',
         rowNum: '',
-        columns: 0,
-        layers: 0,
         status: null,
         locationType: ''
       },
@@ -96,17 +97,13 @@ export default {
         ],
         code: [
           { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' }
+        ],
+        layers: [
+          { pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
+        ],
+        columns: [
+          { pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
         ]
-        // layers: [{
-        // type: 'number',
-        // message: this.$t('module.basicData.cache.warning'),
-        // trigger: "blur"
-        // }],
-        // columns:  [{
-        // type: 'number',
-        // message: this.$t('module.basicData.cache.warning'),
-        // trigger: "blur"
-        // }]
       }
     }
   },
@@ -119,7 +116,7 @@ export default {
         if (this.dataForm.id) {
           locationDetail(this.dataForm.id).then(res => {
             this.dataForm = res.data
-            console.log(this.dataForm)
+            // console.log(this.dataForm)
           })
         } else {
           locationCode().then(res => {
@@ -173,6 +170,28 @@ export default {
         }
       })
     }
+    // isInt(value){
+    //   for(var i = 0; i < value.length; i++) {
+    //     if(charAt[i] == '.'){
+    //     }
+    //   }
+    // }
+    // isInt(value) {
+    //   let zero = /^0+\d*$/ // 过滤以0开头的数据(不含小数点)
+    //   let dublue = /^0{2,}\.\d+$/ // 过滤小数点前有两个以上0的数字
+    //   let point = /^\d+\.?\d+$/ //  以数字开头,可以允许出现一次或0次小数点,以数字结尾(这里的数字必须有两个)
+    //   let reg = /^[1-9]{1}$/ // 匹配只有一个数字的情况
+    //   if (!value) {
+    //     return false
+    //   }
+    //   if (zero.test(value) || dublue.test(value)) { // 首先过滤掉错误的数据
+    //     return false
+    //   } else if (point.test(value) || reg.test(value)) { // 匹配数据,如果输入的数字只有一位数时用reg匹配
+    //     return true
+    //   } else {
+    //     return false
+    //   }
+    // }
   }
 }
 </script>

src/views/basicData/Cache/components/storageBox-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-09 16:53:31
+ * @LastEditTime: 2022-03-14 16:23:19
  * @Description:
 -->
 <template>
@@ -59,15 +59,15 @@ export default {
       options: [
         {
           value: 0,
-          label: '正常'
+          label: this.$t('module.basicData.storageBox.normal')
         },
         {
           value: 1,
-          label: '维修中'
+          label: this.$t('module.basicData.storageBox.repairing')
         },
         {
           value: 2,
-          label: '报废'
+          label: this.$t('module.basicData.storageBox.scrapped')
         }
       ],
       dataRule: {

src/views/basicData/Equipment/components/equipmentInfo-add.vue

@@ -58,7 +58,7 @@
               <el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" />
             </el-form-item> -->
             <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="EquipmentType">
-              <el-select v-model="dataForm.equipmentType" :placeholder="dataForm.equipmentType">
+              <el-select v-model="dataForm.equipmentType" :placeholder="this.$t('module.basicData.cache.logisticsEquipment')" default>
                 <el-option
                   v-for="item in options"
                   :key="item.value"