1

src/views/system/goods/index.vue

@@ -219,11 +219,8 @@
             v-if="isColumnVisible(col.prop)"
           >
             <template slot-scope="scope">
-              <template v-if="col.type === 'dict'">
+              <template v-if="col.prop === 'goodsStatus'">
-                <dict-tag :options="dict.type[col.dict]" :value="scope.row[col.prop]"/>
+                {{scope.row.goodsStatus=='1'?'禁用':'启用'}}
-              </template>
-              <template v-if="col.prop === 'sts'">
-                <dict-tag :options="dict.type.kc_sts" :value="scope.row.sts"/>
               </template>
               <template v-else-if="col.type === 'number'">
                 <span class="number-column">{{ scope.row[col.prop] }}</span>

src/views/system/location/index.vue

@@ -33,54 +33,6 @@
       <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="84px" :size="formSize">
         <div class="search-form-content" :class="{ 'is-advanced': isAdvanced }">
           <template v-if="isAdvanced">
-            <!--<el-form-item label="库位号" prop="locationId">-->
-              <!--<el-input-->
-                <!--v-model="queryParams.locationId"-->
-                <!--placeholder="请输入库位号"-->
-                <!--clearable-->
-                <!--@keyup.enter.native="handleQuery"-->
-              <!--/>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="库位类型" prop="locationType">-->
-              <!--<el-input-->
-                <!--v-model="queryParams.locationType"-->
-                <!--placeholder="请输入库位类型"-->
-                <!--clearable-->
-                <!--@keyup.enter.native="handleQuery"-->
-              <!--/>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="外部库位号" prop="outerId">-->
-              <!--<el-input-->
-                <!--v-model="queryParams.outerId"-->
-                <!--placeholder="请输入外部库位号"-->
-                <!--clearable-->
-                <!--@keyup.enter.native="handleQuery"-->
-              <!--/>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="库区号" prop="areaId">-->
-              <!--<el-input-->
-                <!--v-model="queryParams.areaId"-->
-                <!--placeholder="请输入库区号"-->
-                <!--clearable-->
-                <!--@keyup.enter.native="handleQuery"-->
-              <!--/>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="巷道号" prop="tunnelId">-->
-              <!--<el-input-->
-                <!--v-model="queryParams.tunnelId"-->
-                <!--placeholder="请输入巷道号"-->
-                <!--clearable-->
-                <!--@keyup.enter.native="handleQuery"-->
-              <!--/>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="设备号" prop="equipmentId">-->
-              <!--<el-input-->
-                <!--v-model="queryParams.equipmentId"-->
-                <!--placeholder="请输入设备号"-->
-                <!--clearable-->
-                <!--@keyup.enter.native="handleQuery"-->
-              <!--/>-->
-            <!--</el-form-item>-->
             <el-form-item label="货架排" prop="wRow">
               <el-input
                 v-model="queryParams.wRow"
@@ -105,32 +57,8 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <!--<el-form-item label="深度" prop="wDepth">-->
+            <el-form-item label="库位状态" prop="locationStatus">
-              <!--<el-input-->
+              <el-select v-model="queryParams.locationStatus" placeholder="请选择库位状态" clearable :style="{width: '100%'}">
-                <!--v-model="queryParams.wDepth"-->
-                <!--placeholder="请输入深度"-->
-                <!--clearable-->
-                <!--@keyup.enter.native="handleQuery"-->
-              <!--/>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="是否锁定" prop="isLock">-->
-              <!--<el-input-->
-                <!--v-model="queryParams.isLock"-->
-                <!--placeholder="请输入是否锁定"-->
-                <!--clearable-->
-                <!--@keyup.enter.native="handleQuery"-->
-              <!--/>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="载具号" prop="vehicleId">-->
-              <!--<el-input-->
-                <!--v-model="queryParams.vehicleId"-->
-                <!--placeholder="请输入载具号"-->
-                <!--clearable-->
-                <!--@keyup.enter.native="handleQuery"-->
-              <!--/>-->
-            <!--</el-form-item>-->
-            <el-form-item label="货位状态" prop="locationStatus">
-              <el-select v-model="queryParams.locationStatus" placeholder="请选择货位状态" clearable :style="{width: '100%'}">
                 <el-option v-for="(item, index) in locationStatusOptions" :key="index" :label="item.label"
                            :value="item.value" :disabled="item.disabled"></el-option>
               </el-select>
@@ -271,11 +199,11 @@
             v-if="isColumnVisible(col.prop)"
           >
             <template slot-scope="scope">
-              <template v-if="col.type === 'dict'">
+              <template v-if="col.prop === 'locationStatus'">
-                <dict-tag :options="dict.type[col.dict]" :value="scope.row[col.prop]"/>
+                  {{scope.row.locationStatus=='1'?'占用':'空闲'}}
               </template>
-              <template v-if="col.prop === 'sts'">
+              <template v-else-if="col.prop === 'isEnable'">
-                <dict-tag :options="dict.type.kc_sts" :value="scope.row.sts"/>
+                  {{scope.row.isEnable=='1'?'禁用':'启用'}}
               </template>
               <template v-else-if="col.type === 'number'">
                 <span class="number-column">{{ scope.row[col.prop] }}</span>
@@ -332,20 +260,11 @@
         <el-form-item label="库位编码" prop="locationId">
           <el-input v-model="form.locationId" placeholder="请输入库位号" />
         </el-form-item>
-        <!--<el-form-item label="深度" prop="wDepth">-->
-          <!--<el-input v-model="form.wDepth" placeholder="请输入深度" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="是否锁定" prop="isLock">-->
-          <!--<el-input v-model="form.isLock" placeholder="请输入是否锁定" />-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="载具号" prop="vehicleId">-->
-          <!--<el-input v-model="form.vehicleId" placeholder="请输入载具号" />-->
-        <!--</el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="货位状态" prop="locationStatus">
+        <el-form-item label="库位状态" prop="locationStatus">
-          <el-select v-model="form.locationStatus" placeholder="请选择货位状态" clearable :style="{width: '100%'}">
+          <el-select v-model="form.locationStatus" placeholder="请选择库位状态" clearable :style="{width: '100%'}">
             <el-option v-for="(item, index) in locationStatusOptions" :key="index" :label="item.label"
                        :value="item.value" :disabled="item.disabled"></el-option>
           </el-select>
@@ -567,6 +486,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
         locationId: null,
         locationType: null,
         locationStatus: null,
@@ -599,7 +519,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.locationId)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -623,7 +543,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.locationId != null) {
+          if (this.form.id != null) {
             updateLocation(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -653,7 +573,7 @@ export default {
 
     /** 启用禁用按钮操作 */
     handleEnable(row) {
-      const materialCodes = row.locationId || this.ids;
+      const materialCodes = row.id || this.ids;
       this.$modal.confirm('是否确认启用禁用库位号为"' + materialCodes + '"的数据项？').then(function () {
         return enableLocation(materialCodes);
       }).then(() => {

src/views/system/stand/index.vue

@@ -132,16 +132,16 @@
             v-hasPermi="['app:stand:export']"
           >导出</el-button>
         </el-tooltip>
-        <el-tooltip content="导入数据" placement="top">
+        <!--<el-tooltip content="导入数据" placement="top">-->
-          <el-button
+          <!--<el-button-->
-            type="warning"
+            <!--type="warning"-->
-            plain
+            <!--plain-->
-            icon="el-icon-download"
+            <!--icon="el-icon-download"-->
-            size="mini"
+            <!--size="mini"-->
-            @click="handleImport"
+            <!--@click="handleImport"-->
-            v-hasPermi="['app:stand:import']"
+            <!--v-hasPermi="['app:stand:import']"-->
-          >导入</el-button>
+          <!--&gt;导入</el-button>-->
-        </el-tooltip>
+        <!--</el-tooltip>-->
         <el-tooltip content="列设置" placement="top">
           <el-button
             icon="el-icon-setting"
@@ -186,11 +186,8 @@
             v-if="isColumnVisible(col.prop)"
           >
             <template slot-scope="scope">
-              <template v-if="col.type === 'dict'">
+              <template v-if="col.prop === 'standStatus'">
-                <dict-tag :options="dict.type[col.dict]" :value="scope.row[col.prop]"/>
+                {{scope.row.isEnable=='1'?'禁用':'启用'}}
-              </template>
-              <template v-if="col.prop === 'sts'">
-                <dict-tag :options="dict.type.kc_sts" :value="scope.row.sts"/>
               </template>
               <template v-else-if="col.type === 'number'">
                 <span class="number-column">{{ scope.row[col.prop] }}</span>
@@ -226,16 +223,6 @@
         <el-form-item label="站点类型" prop="standType">
           <el-input v-model="form.standType" placeholder="请输入站点名称" />
         </el-form-item>
-        <!--<el-form-item label="站点类型" prop="standType">-->
-          <!--<el-select v-model="form.standType" placeholder="请选择站点类型">-->
-            <!--<el-option-->
-              <!--v-for="dict in dict.type.site_type"-->
-              <!--:key="dict.value"-->
-              <!--:label="dict.label"-->
-              <!--:value="dict.value"-->
-            <!--&gt;</el-option>-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
         <el-form-item label="所在区域" prop="standArea">
           <el-input v-model="form.standArea" placeholder="请输入站点区域" />
         </el-form-item>
@@ -511,7 +498,7 @@ export default {
     handleExport() {
       this.download('app/stand/export', {
         ...this.queryParams
-      }, `material_${new Date().getTime()}.xlsx`)
+      }, `stand_${new Date().getTime()}.xlsx`)
     },
     handleImport() {
       this.upload.title = '导入';
@@ -519,7 +506,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('/app/stand/importTemplate', {}, `bas_site_${new Date().getTime()}.xlsx`);
+      this.download('/app/stand/importTemplate', {}, `bas_stand_${new Date().getTime()}.xlsx`);
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {

src/views/system/vehicle/index.vue

@@ -409,7 +409,7 @@ export default {
     /** 下载模板操作 */
     importTemplate() {
       this.download('app/vehicle/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
+      }, `vehicle_template_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {