9/19(2)

src/api/production/gfual.js

 import request from '@/utils/request'
-// 根据key值查询数据字典数据
-export function getDictData(params) {
+
+// 查询列表
+export function queryList(params) {
   return request({
-    url: '/wbapply/queryDict',
+    url: '/ysgxlog/queryYsGxLogByPagination',
     method: 'get',
     params
   })
 }
-// 新增设备新增
-export function addApplication(data) {
+// 添加基础信息接口
+export function add(data) {
   return request({
-    url: '/wbapply/add',
+    url: '/ysgxlog/add',
     method: 'post',
     data,
     headers: {
@@ -18,10 +19,47 @@ export function addApplication(data) {
     }
   })
 }
-// 分页查询要处理的设备
-export function getEquipment(params) {
+
+// 根据id查询基础信息接口
+export function getDetailById(id) {
+  return request({
+    url: '/ysgxlog/detail/' + id,
+    method: 'get'
+  })
+}
+// 编辑基础信息接口
+export function updataInfo(data) {
   return request({
-    url: '/wbwarehouse/canceListByPagination',
+    url: '/ysgxlog/update',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+// 逻辑删除基础信息接口
+export function deleteLogical(id) {
+  return request({
+    url: '/ysgxlog/deleteLogical/' + id,
+    method: 'delete'
+  })
+}
+// 导出信息接口
+export function exporTable(params) {
+  return request({
+    url: '/wbchemistrybaseinfo/export',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
+
+// 根据key值查询数据字典数据
+export function getDictData(params) {
+  return request({
+    url: '/wbapply/queryDict',
     method: 'get',
     params
   })

src/views/production/craftsmanship/index.vue

@@ -205,27 +205,27 @@
         label-width="80px"
       >
         <el-form-item label="jxpn：" prop="jxpn">
-          <el-input v-model.trim="singleDetails.jxpn" :readonly="true" />
+          <el-input :value="singleDetails.jxpn || '-'" :readonly="true" />
         </el-form-item>
 
         <el-form-item label="jbcode：" prop="jbcode">
-          <el-input v-model.trim="singleDetails.jbcode" :readonly="true" />
+          <el-input :value="singleDetails.jbcode || '-'" :readonly="true" />
         </el-form-item>
 
         <el-form-item label="jbrank：" prop="jbrank">
-          <el-input v-model.trim="singleDetails.jbrank" :readonly="true" />
+          <el-input :value="singleDetails.jbrank || '-'" :readonly="true" />
         </el-form-item>
 
         <el-form-item label="wb：" prop="wb">
-          <el-input v-model.trim="singleDetails.wb" :readonly="true" />
+          <el-input :value="singleDetails.wb || '-'" :readonly="true" />
         </el-form-item>
 
         <el-form-item label="jl：" prop="jl">
-          <el-input v-model.trim="singleDetails.jl" :readonly="true" />
+          <el-input :value="singleDetails.jl || '-'" :readonly="true" />
         </el-form-item>
 
         <el-form-item label="gx：" prop="gx">
-          <span style="margin-left: 10px">{{ replace(singleDetails.gx) }}</span>
+          <span style="margin-left: 10px">{{ replace(singleDetails.gx) || '-' }}</span>
         </el-form-item>
 
         <el-form-item label="操作人：" prop="createName">

src/views/production/gfual/index.vue

 <template>
     <div class="app-container">
+      <div style="width: 80%; margin-left: 80px; padding-left: 8.6%">
         <el-form ref="form" :model="form" :rules="rule" label-width="80px">
           <el-row :gutter="40">
-          <el-col :span="12" style="padding-left: 10%;">
+            <el-col :span="12" >
               <el-form-item label="pn：" style="flex-basis: 50%;" prop="pn">
                 <el-input ref="input1" v-model="form.pn" placeholder="请输入pn" :minlength="3" style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="40">
-          <el-col :span="12" style="padding-left: 10%;">
+            <el-col :span="12" >
               <el-form-item label="lot：" style="flex-basis: 50%;" prop="lot">
                 <el-input ref="input2" v-model="form.lot" placeholder="请输入lot" style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(2,$event)" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="40">
-          <el-col :span="12" style="padding-left: 10%;">
-            <el-form-item label="gx：" style="flex-basis: 50%;" prop="gx">
+            <el-col :span="8">
+              <el-form-item label="gx：" prop="gx">
                 <el-select
                   v-model="form.gx"
                   clearable
                   placeholder="请选择gx"
-                style="width: 400px"
+                  style="width: 100%; max-width: 400px;"
                   @change="handlePgxChange"
                 >
                   <el-option
-                    v-for="(dict,index) in pissbList"
+                    v-for="(dict, index) in pissbList"
                     :key="index"
                     :label="dict.dictLabel"
                     :value="dict.dictValue"
@@ -34,27 +35,37 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          <el-col :span="12">
-            <el-form-item label="machine：" style="flex-basis: 50%;" prop="machine">
-              <el-input ref="input4" v-model="form.machine" placeholder="请输入machine" style="width: 400px" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
+
+            <el-col :span="8">
+              <el-form-item label="machine：" prop="machine">
+                <el-input ref="input4" v-model="form.machine" placeholder="请输入machine" style="width: 100%; max-width: 400px;" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item>
+                <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
               </el-form-item>
             </el-col>
           </el-row>
+
+
+
           <hr>
       
           <el-row :gutter="40">
-          <el-col :span="12" style="padding-left: 10%;">
+            <el-col :span="12" >
               <el-form-item label="jbcode：" style="flex-basis: 50%;" prop="jbcode">
                 <el-input ref="input5" v-model="form.jbcode" placeholder="请输入jbcode" :minlength="3" style="width: 800px" :maxlength="100" @keyup.enter.native="handleTab(4, $event)" />
               </el-form-item>
             </el-col>
           </el-row>
 
-        <el-row :gutter="40">
-          <el-col :span="8" style="padding-left: 10%;">
+          <el-row :gutter="0" style="display: flex; width: 60%;">
+            <el-col :span="8">
               <el-form :model="form" ref="form" :rules="rules" label-width="80px">
                 <el-form-item label="jbtype：" prop="jbtype">
-                <el-input v-model="form.jbtype" placeholder="jbtype" :disabled="true" style="width: 200px" />
+                  <el-input v-model="form.jbtype" placeholder="jbtype" :disabled="true" style="width: 100%;" />
                 </el-form-item>
               </el-form>
             </el-col>
@@ -62,7 +73,7 @@
             <el-col :span="8">
               <el-form :model="form" ref="form" :rules="rules" label-width="80px">
                 <el-form-item label="jbrank：" prop="jbrank">
-                <el-input v-model="form.jbrank" placeholder="jbrank" :disabled="true" style="width: 200px" />
+                  <el-input v-model="form.jbrank" placeholder="jbrank" :disabled="true" style="width: 100%;" />
                 </el-form-item>
               </el-form>
             </el-col>
@@ -70,12 +81,71 @@
             <el-col :span="8">
               <el-form :model="form" ref="form" :rules="rules" label-width="80px">
                 <el-form-item label="jbLot：" prop="jbLot">
-                <el-input v-model="form.jbLot" placeholder="jbLot" :disabled="true" style="width: 200px" />
+                  <el-input v-model="form.jbLot" placeholder="jbLot" :disabled="true" style="width: 100%;" />
                 </el-form-item>
               </el-form>
             </el-col>
           </el-row>
 
+          <el-row :gutter="40">
+            <el-col :span="12" >
+              <el-form-item label="wbcode：" style="flex-basis: 50%;" prop="wbcode">
+                <el-input ref="input6" v-model="form.wbcode" placeholder="请输入wbcode" :minlength="3" style="width: 300px" :maxlength="100" @keyup.enter.native="handleTab(5, $event)" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="40">
+            <el-col :span="12" >
+              <el-form-item label="wblot：" style="flex-basis: 50%;" prop="wblot">
+                <el-input ref="input7" v-model="form.wblot" placeholder="请输入wblot" :minlength="3" style="width: 300px" :maxlength="100" @keyup.enter.native="handleTab(6, $event)" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="40">
+            <el-col :span="12" >
+              <el-form-item label="jlcod：" style="flex-basis: 50%;" prop="jlcod">
+                <el-input ref="input8" v-model="form.jlbcod" placeholder="请输入jlbcod" :minlength="3" style="width: 800px" :maxlength="100" @keyup.enter.native="handleTab(7, $event)" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="0" style="display: flex; width: 60%;">
+            <el-col :span="8">
+              <el-form :model="form" ref="form" :rules="rules" label-width="80px">
+                <el-form-item label="jltype：" prop="jltype">
+                  <el-input v-model="form.jbtype" placeholder="jltype" :disabled="true" style="width: 100%;" />
+                </el-form-item>
+              </el-form>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form :model="form" ref="form" :rules="rules" label-width="80px">
+                <el-form-item label="jllot：" prop="jllot">
+                  <el-input v-model="form.jbrank" placeholder="jllot" :disabled="true" style="width: 100%;" />
+                </el-form-item>
+              </el-form>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form :model="form" ref="form" :rules="rules" label-width="80px">
+                <el-form-item label="jlbzq：" prop="jlbzq">
+                  <el-input v-model="form.jbLot" placeholder="jlbzq" :disabled="true" style="width: 100%;" />
+                </el-form-item>
+              </el-form>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="40">
+            <el-col :span="12" >
+              <el-form-item label="lockUser：" style="flex-basis: 50%;" prop="lockUser">
+                <el-input ref="input9" v-model="form.lockUser" placeholder="请输入lockUser" :minlength="3" style="width: 300px" :maxlength="100" @keyup.enter.native="handleTab(8, $event)" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+            
         </el-form>
         <el-form label-width="80px">
           <el-row style="padding-left: 8.7%; padding-top: 1%">
@@ -88,6 +158,7 @@
           </el-row>
         </el-form>
       </div>
+    </div>
   </template>
   
   <script>
@@ -157,6 +228,21 @@ export default {
         this.isRequired = false
       }
     },
+    /** 查询按钮操作 */
+    handleQuery() {
+      this.form.page = 1
+      this.getList()
+    },
+    /** 查询基础信息列表 */
+    getList() {
+      this.loading = true
+      listBasicInfo(this.queryParams).then(res => {
+        res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
+        this.total = res.total
+        this.basicInfoList = res.rows
+        this.loading = false
+      })
+    },
     resetQuery() {
       this.form = {
         pn: '',

src/views/production/gxlog/index.vue

@@ -246,8 +246,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="gx：  " prop="gx">
-              <span>{{ replace(singleDetails.gx) }}</span>
+            <el-form-item label="gx：" prop="gx">
+              <span style="margin-left: 10px">{{ replace(singleDetails.gx) }}</span>
             </el-form-item>
           </el-col>
         </el-row>