Browse Source

修改字段

潘超林 5 months ago
parent
commit
82d8315db9
2 changed files with 22 additions and 25 deletions
  1. 17 7
      src/views/equipment.vue
  2. 5 18
      src/views/index.vue

+ 17 - 7
src/views/equipment.vue

@@ -76,6 +76,13 @@
               </el-switch> -->
             </template>
           </el-table-column>
+          
+          <el-table-column label="设备添加方式" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.type == 1 ? "绑定" : "新增" }}
+            </template>
+          </el-table-column>
+
           <el-table-column label="语音开关" align="center">
             <template slot-scope="scope">
               {{
@@ -195,6 +202,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" :xs="12">
+            <el-form-item label="设备添加方式" prop="type">
+              <el-select v-model="form.type" placeholder="请选择">
+                <el-option label="新增" :value="0" />
+                <el-option label="绑定" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" :xs="12">
             <el-form-item label="自动切刀" prop="autocut">
               <el-switch
                 v-model="form.autocut"
@@ -250,6 +265,7 @@ export default {
         autocut: 0,
         voice: "",
         remark: "",
+        type: 0,
       },
       open: false,
       loading: false,
@@ -273,7 +289,6 @@ export default {
   },
   methods: {
     handleAdd() {
-      this.type = "";
       this.title = "新增设备";
       this.form = {
         pkey: null,
@@ -282,13 +297,8 @@ export default {
         autocut: 0,
         voice: "",
         remark: "",
+        type: 0,
       };
-      const debugMode = process.env.VUE_APP_PRINT_SWITCH;
-      if (debugMode) {
-        this.form["type"] = 1;
-      } else {
-        this.form["type"] = 0;
-      }
       this.open = true;
     },
     handleEdit(record) {

+ 5 - 18
src/views/index.vue

@@ -34,23 +34,6 @@
               />
             </el-select>
           </el-form-item>
-
-          <!-- <el-form-item label="物流状态" prop="status">
-            <el-select
-              v-model="queryParams.status"
-              placeholder="请选择商品状态"
-              clearable
-              style="width: 180px"
-            >
-              <el-option label="全部" value="" />
-              <el-option label="待支付" value="10" />
-              <el-option label="待装货" value="20" />
-              <el-option label="运送中" value="30" />
-              <el-option label="待签收" value="40" />
-              <el-option label="已完成" value="50" />
-              <el-option label="已取消" value="60" />
-            </el-select>
-          </el-form-item> -->
           <el-form-item>
             <el-button
               type="primary"
@@ -843,8 +826,12 @@ export default {
           this.pagination.page = res.data.page;
           this.loading = false;
         } else {
-          this.$message.error(res.msg);
           this.loading = false;
+          this.$message.error(res.msg);
+          this.tableList = [];
+          this.pagination.total = 0;
+          this.pagination.page = 1;
+      
         }
       });
     },