Merge remote-tracking branch 'origin/master'

.env.development

@@ -12,8 +12,8 @@ VUE_APP_CONTEXT_PATH = '/'
 # 监控地址
 VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'
 
-# xxl-job 控制台地址
 VUE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
+# xxl-job 控制台地址
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -9,10 +9,10 @@ VUE_APP_TITLE = UDI协调平台
 ENV = 'production'
 
 
-
+# 线上
-# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
 # 叶东旭
-VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_CPT_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_CPT_SERVER/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_CPT_CLIENT/'

src/views/udi/trace/search/index.vue

@@ -135,7 +135,6 @@
           </el-col>
         </el-row>
       </el-form>
-
       <div class="top-right-btn" style="display:flex;">
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏
@@ -156,7 +155,7 @@
             <p class="form-title">生产信息</p>
           </template>
           <el-table v-loading="loading" :data="listOrder"
-                    style="width: 100%"
+                    style="width: 100%;margin-top: 15px"
                     @row-click="handleSelectionChange"
                     highlight-current-row border>
             <el-table-column label="序号" type="index"></el-table-column>
@@ -196,7 +195,8 @@
                 <el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
                 <el-table-column label="序列号" prop="serialNo" width="120"></el-table-column>
                 <el-table-column label="包装层级" prop="bzcj" width="180"></el-table-column>
-                <el-table-column label="包装状态" prop="packState" width="180" :formatter="formaterPackState"></el-table-column>
+                <el-table-column label="包装状态" prop="packState" width="180"
+                                 :formatter="formaterPackState"></el-table-column>
                 <el-table-column label="操作" width="100" fixed="right">
                   <template slot-scope="scope">
                     <el-button
@@ -467,13 +467,16 @@
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
             <el-table-column label="单据类型" prop="billType" width="100"></el-table-column>
-            <el-table-column label="单据源头类型" prop="sourceType" width="100" :formatter="formaterSourceType"></el-table-column>
+            <el-table-column label="单据源头类型" prop="sourceType" width="100"
-            <el-table-column label="出入库类型" prop="inOutType" width="100" :formatter="formaterInOutType"></el-table-column>
+                             :formatter="formaterSourceType"></el-table-column>
+            <el-table-column label="出入库类型" prop="inOutType" width="100"
+                             :formatter="formaterInOutType"></el-table-column>
             <el-table-column label="单据日期" prop="billDate" width="150"></el-table-column>
             <el-table-column label="更新时间" prop="updateTime" width="150"></el-table-column>
             <el-table-column label="发货企业" prop="fromCorp" width="220"></el-table-column>
             <el-table-column label="收货企业" prop="toCorp" width="220"></el-table-column>
-            <el-table-column label="所属企业" prop="companyIdFk" width="220" :formatter="formatCompanyName"></el-table-column>
+            <el-table-column label="所属企业" prop="companyIdFk" width="220"
+                             :formatter="formatCompanyName"></el-table-column>
 
             <!--        <el-table-column label="备注" prop="remark" width="220"></el-table-column>-->
 
@@ -507,13 +510,13 @@
       </el-collapse>
     </el-card>
 
-<!--      <pagination-->
+    <!--      <pagination-->
-<!--        v-show="total>0"-->
+    <!--        v-show="total>0"-->
-<!--        :total="total"-->
+    <!--        :total="total"-->
-<!--        :limit.sync="filterQuery.limit"-->
+    <!--        :limit.sync="filterQuery.limit"-->
-<!--        :page.sync="filterQuery.page"-->
+    <!--        :page.sync="filterQuery.page"-->
-<!--        @pagination="getList"-->
+    <!--        @pagination="getList"-->
-<!--      ></pagination>-->
+    <!--      ></pagination>-->
 
     <el-dialog
       title="单据-详情"
@@ -712,8 +715,10 @@
 
 <script>
 
-import {filterylqxzcrbarmc,filterCpmctymc,
+import {
-  filterGgxh, filterNameCode, sourceSearch,filterCompanyName} from "@/api/udi/udiTrace";
+  filterylqxzcrbarmc, filterCpmctymc,
+  filterGgxh, filterNameCode, sourceSearch, filterCompanyName
+} from "@/api/udi/udiTrace";
 
 
 export default {
@@ -749,35 +754,35 @@ export default {
     }
   },
   methods: {
-    formaterSourceType(row){
+    formaterSourceType(row) {
       if (row.sourceType == 1) {
         this.formateSourceType = "起始位置"
         return "起始位置"
-      }else if (row.sourceType == 2){
+      } else if (row.sourceType == 2) {
         this.formateSourceType = "中间位置"
         return "中间位置"
-      }else {
+      } else {
         this.formateSourceType = "结束位置"
         return "结束位置"
       }
     },
-    formaterInOutType(row){
+    formaterInOutType(row) {
       if (row.inOutType == 1) {
         this.formateInOutType = "入库"
         return "入库"
-      }else {
+      } else {
         this.formateInOutType = "出库"
         return "出库"
       }
     },
-    formatCompanyName(row){
+    formatCompanyName(row) {
-      let temp =  this.companyNameList.find(item=>{
+      let temp = this.companyNameList.find(item => {
         return item.id == row.companyIdFk
       })
       this.formateCompanyName = temp.companyName
       return temp && temp.companyName
     },
-    getCompanyName(){
+    getCompanyName() {
       let cQuery = {
         page: 1,
         limit: 10,
@@ -787,7 +792,7 @@ export default {
         console.log(this.companyNameList)
       })
     },
-    nameCodeChange(){
+    nameCodeChange() {
       this.filterQuery.batchNo = null
     },
     ggxhChange() {
@@ -945,6 +950,15 @@ div /deep/ .el-table .success-row {
   /*transition: all .5s;*/
 }
 
+.form-title {
+  font-size: 16px;
+  font-family: Noto Sans SC;
+  font-weight: bold;
+  color: #303133;
+  padding-bottom: 17px;
+  padding-top: 17px;
+}
+
 .query-form-item {
   display: block !important;
   margin-bottom: 5px;