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

src/api/equipment/equipmentAbandonment.js

@@ -77,9 +77,9 @@ export function changeRoleStatus(businessId, flag) {
 }
 
 // 删除角色
-export function delRole(roleId) {
+export function delEquipment(equipmentId) {
     return request({
-      url: '/system/role/deleteLogical/' + roleId,
+      url: '/wbwarehouse/deleteLogical/' + equipmentId,
       method: 'delete'
   })
 }

src/views/equipment/basicInfo.vue

@@ -86,9 +86,9 @@
             {{ scope.row.prank || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
+        <el-table-column label="操作员" prop="createName">
           <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
+            {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">

src/views/equipment/check.vue

@@ -156,6 +156,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
+<!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
     <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
         <el-row>
@@ -171,25 +172,14 @@
           </el-col>
         </el-row>
 
+        
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="plocation：" prop="plocation">
               <el-input v-model.trim="singleDetails.plocation" :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-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="prank：" prop="prank">
               <el-input v-model.trim="singleDetails.prank" :readonly="true" />
@@ -208,9 +198,29 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="厚度：" prop="phd">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="厚度：" prop="phd">
           <el-input v-model.trim="singleDetails.phd" :readonly="true" />
         </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            
+          </el-col>
+        </el-row>
+        <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-dialog>
   </div>

src/views/equipment/checkProcess.vue

@@ -171,25 +171,14 @@
           </el-col>
         </el-row>
 
+        
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="plocation：" prop="plocation">
               <el-input v-model.trim="singleDetails.plocation" :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-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="prank：" prop="prank">
               <el-input v-model.trim="singleDetails.prank" :readonly="true" />
@@ -208,9 +197,29 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="厚度：" prop="phd">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="厚度：" prop="phd">
           <el-input v-model.trim="singleDetails.phd" :readonly="true" />
         </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            
+          </el-col>
+        </el-row>
+        <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-dialog>
   </div>

src/views/equipment/draw.vue

@@ -12,9 +12,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="phd" prop="phd">
+      <el-form-item label="phd" prop="phdStr">
         <el-input
-          v-model="queryParams.phd"
+          v-model="queryParams.phdStr"
           placeholder="请输入phd"
           clearable
           size="small"
@@ -22,9 +22,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="prank" prop="prank">
+      <el-form-item label="prank" prop="prankStr">
         <el-input
-          v-model="queryParams.prank"
+          v-model="queryParams.prankStr"
           placeholder="请输入prank"
           clearable
           size="small"
@@ -67,25 +67,15 @@
             {{ scope.row.pissb || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="pstatus" prop="pstatus">
-          <template slot-scope="scope">
-            {{ scope.row.pstatus || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="ptype" prop="ptype">
-          <template slot-scope="scope">
-            {{ scope.row.ptype || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="状态" prop="pstatus">
           <template slot-scope="scope">
             <span v-if="scope.row.pstatus === '0'" style="color: red">未完成</span>
             <span v-else style="color: green">已完成</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
+        <el-table-column label="操作员" prop="createName">
           <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
+            {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
@@ -100,7 +90,7 @@
               type="text"
               style="color: #49cec9"
               @click="handleUpdate(scope.row)"
-            >修改</el-button>
+            >处理</el-button>
             <el-button
               size="mini"
               type="text"

src/views/equipment/equipmentAbandonment.vue

@@ -167,25 +167,14 @@
           </el-col>
         </el-row>
 
+        
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="plocation：" prop="plocation">
               <el-input v-model.trim="singleDetails.plocation" :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-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="prank：" prop="prank">
               <el-input v-model.trim="singleDetails.prank" :readonly="true" />
@@ -204,9 +193,29 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="厚度：" prop="phd">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="厚度：" prop="phd">
           <el-input v-model.trim="singleDetails.phd" :readonly="true" />
         </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            
+          </el-col>
+        </el-row>
+        <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-dialog>
   </div>
@@ -224,7 +233,7 @@ import {
   updateRole
 } from '@/api/system/role'
 import {listCheck} from '@/api/equipment/check'
-
+import {delEquipment} from  '../../api/equipment/equipmentAbandonment'
 import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
 import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
@@ -676,13 +685,15 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const roleIds = row.businessId || this.ids
+      console.log(row)
+      const EquipmentIds = row.businessId || this.ids
       this.$confirm('是否确认操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return delRole(roleIds)
+        console.log(row)
+        return delEquipment(EquipmentIds)
       }).then(() => {
         this.getList()
         this.$message({

src/views/processManagement/draw.vue

@@ -67,25 +67,15 @@
             {{ scope.row.pissb || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="pstatus" prop="pstatus">
-          <template slot-scope="scope">
-            {{ scope.row.pstatus || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="ptype" prop="ptype">
-          <template slot-scope="scope">
-            {{ scope.row.ptype || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="状态" prop="pstatus">
           <template slot-scope="scope">
             <span v-if="scope.row.pstatus === '0'" style="color: red">未完成</span>
             <span v-else style="color: green">已完成</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
+        <el-table-column label="操作员" prop="createName">
           <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
+            {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
@@ -100,7 +90,7 @@
               type="text"
               style="color: #49cec9"
               @click="handleUpdate(scope.row)"
-            >修改</el-button>
+            >处理</el-button>
             <el-button
               size="mini"
               type="text"

src/views/sample/basicInformation/index.vue

@@ -49,7 +49,7 @@
     <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="basicinfoMationList">
         <el-table-column type="index" label="序号" width="50" />
         <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
@@ -57,14 +57,14 @@
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
+        <el-table-column label="name" prop="name" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.qty || '-' }}
+            {{ scope.row.name || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="name" prop="name" :show-overflow-tooltip="true">
+        <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.name || '-' }}
+            {{ scope.row.qty || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="max_qty" prop="max_qty" :show-overflow-tooltip="true">
@@ -87,9 +87,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" prop="create_date" :show-overflow-tooltip="true">
+        <el-table-column label="操作日期" prop="createDate" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.create_date || '-' }}
+            {{ parseTime(scope.row.createDate,'{y}-{m}-{d} {h}:{i}') || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作">
@@ -157,6 +157,7 @@
 
 <script>
 import { queryList, add, getDetailById, updataInfo, deleteLogical } from '@/api/sample/basicInformation'
+import {parseTime} from "@/utils";
 
 export default {
   name: 'Index',
@@ -225,7 +226,6 @@ export default {
             })
           } else {
             add(this.form).then(res => {
-              console.log('res', res)
               if (res.code === 200) {
                 this.open = false
                 this.$message.success('操作成功')
@@ -238,7 +238,6 @@ export default {
           }
         } else {
           // 校验失败，显示错误信息或进行其他操作
-          console.log('22222')
         }
       })
     },
@@ -247,22 +246,26 @@ export default {
       this.reFrom()
     },
     handleDelete(row) {
-      console.log('row',row)
       const id = row.businessId
-      deleteLogical(id).then(res => {
-        console.log('res',res)
-        if (res.code === 200) {
-          this.$message.success('操作成功')
-          this.getList()
-        }
+      this.$confirm('是否确认操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
+        deleteLogical(id).then(res => {
+          console.log('res', res)
+          if (res.code === 200) {
+            this.$message.success('操作成功')
+            this.getList()
+          }
+        })
       })
     },
     // 编辑
     handleUpdate(row) {
-      console.log('row', row)
+      this.title = '编辑基础信息表单'
       const id = row.businessId
       getDetailById(id).then(res => {
-        console.log('res', res)
         this.form = res.data
         this.open = true
       })
@@ -272,6 +275,7 @@ export default {
       this.loading = true
       queryList(this.queryParams).then(res => {
         console.log('res', res)
+        res.rows.createDate = parseTime(res.rows.createDate,'{y}-{m}-{d}')
         this.total = res.total
         this.basicinfoMationList = res.rows
         this.loading = false