Parcourir la source

产品出入库通用接口开发

wucl il y a 11 mois
Parent
commit
5ed5d539c4

+ 1 - 1
src/components/ScanEntry.vue

@@ -100,7 +100,7 @@ label {
 }
 
 .input:focus ~ label, .input:valid ~ label {
- top: -20px;
+ top: -10px;
  font-size: 14px;
  color: #5264AE;
 }

+ 10 - 3
src/views/major/productionIn.vue

@@ -3,7 +3,12 @@
     <div class="title-container">
       <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
     </div>
-    <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
+    <div style="margin-top: 27px;">
+      <el-card class="box-card" shadow="never">
+       <ScanEntry ref="scanEntry" @scanEntryFun="handleScanEntry" label="请扫描二维码或输入产品号" />
+      </el-card>
+    </div>
+    <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList"> 
       <template slot="left">
         <el-input v-model="listQuery.keyword" placeholder="关键字搜索..." clearable
           style="margin-left: 20px;width: 500px;float: left;">
@@ -29,7 +34,7 @@
         <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
         </el-button>
       </template>
-      <parentTable  :data="pageData.records" slot="table" style="width: 100%;">
+      <parentTable  :data="pageData.records" slot="table" style="width: 100%;" :isBoard=600>
         <el-table-column label="产品报告号" align="center" width='300' >
           <template slot-scope="{row}">
             <span>{{ row.reportNo }}</span>
@@ -77,13 +82,15 @@
 <script>
 import YPageListLayout from '@/components/YPageListLayout'
 import Breadcrumb from '@/components/Breadcrumb'
+import ScanEntry from '@/components/ScanEntry'
 
 
 export default {
   name: 'productionIn',
   components: {
     Breadcrumb,
-    YPageListLayout
+    YPageListLayout,
+    ScanEntry
   },
   filters: {
     

+ 3 - 3
src/views/major/todoDetail.vue

@@ -424,7 +424,7 @@
             <el-row>
               <el-col :span="2">
                 <div>
-                  <el-statistic group-separator="," :precision="4" :value="totalEvaluateValue" title="估价对象总价(万)">
+                  <el-statistic group-separator="," :precision="4" :value="totalEvaluateValue" title="总价(万)">
                     <template slot="prefix">
                       <i class="el-icon-coin"></i>
                     </template>
@@ -433,7 +433,7 @@
               </el-col>
               <el-col :span="2">
                 <div>
-                  <el-statistic group-separator="," :precision="2" :value="totalAcreage" title="估价对象总面积(㎡)">
+                  <el-statistic group-separator="," :precision="2" :value="totalAcreage" title="总面积(平)">
                     <template slot="prefix">
                       <i class="el-icon-house"></i>
                     </template>
@@ -1263,7 +1263,7 @@
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
               <el-form-item label="实勘人:" prop="sites" :rules="{ required: true, message: '实勘人不能为空', trigger: 'blur' }"
                 label-width="120px" class="postInfo-container-item">
-                <el-select v-model="landTarget.sites" placeholder="请选择" multiple filterable clearable style="width:350px"
+                <el-select v-model="landTarget.sites" placeholder="请选择" multiple filterable clearable style="width:100%"
                   @change="sitesChange()" :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
                   :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">
                   <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id" :key="u.id"></el-option>