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

src/api/magnagement.js

@@ -8,4 +8,30 @@ export function listdevice(query) {
     params: query
   })
 }
+export function updatadevice(data) {
+  return request({
+    url: '/wbwarehouse/update',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+export function getDetailById(id) {
+  return request({
+    url: '/wbwarehouse/detail/' + id,
+    method: 'get'
+  })
+}
+export function add(data) {
+  return request({
+    url: '/wbwarehouse/add',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 

src/views/equipment/management.vue

@@ -35,8 +35,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        <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>
       </el-form-item>
     </el-form>
     <div class="placeholder" />
@@ -44,12 +44,12 @@
       <div class="mb12 font-small-bold">设备管理列表</div>
       <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="80" />
-        <el-table-column label="pn" prop="businessId" width="120">
+        <el-table-column label="pn" prop="businessId">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="lot" prop="lot" width="120">
+        <el-table-column label="lot" prop="lot">
           <template slot-scope="scope">
             {{ scope.row.lot || '-' }}
           </template>
@@ -74,7 +74,7 @@
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
           <template slot-scope="scope">
             <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
               详情
@@ -167,19 +167,19 @@
         <el-form-item label="parnk：" prop="prank">
           <el-input v-model.trim="singleDetails.prank" :readonly="true" />
         </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="操作员：" prop="createName">
+              <el-input v-model.trim="singleDetails.createName" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label=" 操作时间：" prop="createDate">
+              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="操作员：" prop="createName">
-            <el-input v-model.trim="singleDetails.createName" :readonly="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label=" 操作时间：" prop="createDate">
-            <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-dialog>
   </div>
 </template>
@@ -305,8 +305,9 @@ export default {
         pn: undefined,
         lot: undefined,
         plocation: undefined,
-        pstatus: 1,
-        ptype: 1
+        pstatus: 0,
+        ptype: 1,
+        delFlag: 0
       },
       // 表单参数
       form: {

src/views/processManagement/basicProcessManagement/index.vue

@@ -35,21 +35,21 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+        <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>
       </el-form-item>
     </el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
-      <div class="mb12 font-small-bold">设备管理列表</div>
+      <div class="mb12 font-small-bold">工序库列表</div>
       <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="80" />
-        <el-table-column label="pn" prop="businessId" width="120">
+        <el-table-column label="pn" prop="businessId">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="lot" prop="lot" width="120">
+        <el-table-column label="lot" prop="lot">
           <template slot-scope="scope">
             {{ scope.row.lot || '-' }}
           </template>
@@ -74,7 +74,7 @@
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
           <template slot-scope="scope">
             <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
               详情
@@ -176,19 +176,19 @@
         <el-form-item label="parnk：" prop="prank">
           <el-input v-model.trim="singleDetails.prank" :readonly="true" />
         </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="操作员：" prop="createName">
+              <el-input v-model.trim="singleDetails.createName" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label=" 操作时间：" prop="createDate">
+              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="操作员：" prop="createName">
-            <el-input v-model.trim="singleDetails.createName" :readonly="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label=" 操作时间：" prop="createDate">
-            <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
-          </el-form-item>
-        </el-col>
-      </el-row>
     </el-dialog>
   </div>
 </template>
@@ -314,8 +314,9 @@ export default {
         pn: undefined,
         lot: undefined,
         plocation: undefined,
-        pstatus: 1,
-        ptype: 2
+        pstatus: 0,
+        ptype: 2,
+        delFlag: 0
       },
       // 表单参数
       form: {