Merge branch 'project1' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project1

src/api/magnagement.js

@@ -34,6 +34,17 @@ export function add(data) {
     }
   })
 }
+// 再利用
+export function recycle(data) {
+  return request({
+    url: '/wbwarehouse/recycle',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 // 逻辑删除基础信息接口
 export function deletedevice(id) {
   return request({

src/views/sample/sampleType/index.vue

@@ -13,7 +13,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="name" prop="name">
+      <el-form-item label="dname" prop="dname">
         <el-input
           v-model="queryParams.dname"
           placeholder="请输入名称"
@@ -23,6 +23,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="dno" prop="dno">
+        <el-input
+          v-model="queryParams.dno"
+          placeholder="请输入dno"
+          clearable
+          size="small"
+          style="width: 150px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
         <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
@@ -36,13 +46,13 @@
             icon="el-icon-plus"
             @click="handleAdd"
           >新增</el-button>
-          <el-button
-            style="padding: 8px 7px;"
-            type="success"
-            size="small"
-            icon="el-icon-download"
-            @click="handleExport"
-          >导出</el-button>
+<!--          <el-button-->
+<!--            style="padding: 8px 7px;"-->
+<!--            type="success"-->
+<!--            size="small"-->
+<!--            icon="el-icon-download"-->
+<!--            @click="handleExport"-->
+<!--          >导出</el-button>-->
         </el-form-item>
       </div>
     </el-form>
@@ -68,22 +78,22 @@
             {{ scope.row.dno || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.remarks || '-' }}
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.remarks || '-' }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="操作人" prop="createName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" prop="createDate" :show-overflow-tooltip="true">
+        <el-table-column label="操作时间" prop="updateDate" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}') || '-' }}
+            {{ parseTime(scope.row.updateDate, '{y}-{m}-{d} {h}:{i}') || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="150px">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -128,9 +138,9 @@
         <el-form-item label="dno" prop="dno">
           <el-input v-model.trim="form.dno" :maxlength="30" placeholder="请输入dno" />
         </el-form-item>
-        <el-form-item label="remarks" prop="remarks">
-          <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />
-        </el-form-item>
+<!--        <el-form-item label="remarks" prop="remarks">-->
+<!--          <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
@@ -154,7 +164,8 @@ export default {
       form: {},
       rules: {
         pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
-        dname: [{ required: true, message: '请输入name', trigger: 'blur' }]
+        dname: [{ required: true, message: '请输入dname', trigger: 'blur' }],
+        dno: [{ required: true, message: '请输入dno', trigger: 'blur' }]
       },
       total: 0,
       loading: false,
@@ -162,7 +173,8 @@ export default {
         page: 1,
         rows: 10,
         pn: '',
-        dname: ''
+        dname: '',
+        dno: ''
       },
       statusOptions: {},
       basicinfoMationList: []
@@ -232,7 +244,7 @@ export default {
     getList() {
       this.loading = true
       queryList(this.queryParams).then(res => {
-        res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
+        res.rows.updateDate = parseTime(res.rows.updateDate, '{y}-{m}-{d}')
         this.total = res.total
         this.basicinfoMationList = res.rows
         this.loading = false
@@ -249,7 +261,8 @@ export default {
         page: 1,
         rows: 10,
         pn: '',
-        dname: ''
+        dname: '',
+        dno: ''
       }
       this.getList()
     },