Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pages/soil-test-manage/test-input/SoilAppendix.vue

nuxt.config.js

@@ -6,6 +6,13 @@ let envFilename = '.env.development'
 if (process.env.NODE_ENV) {
   envFilename = '.env.' + process.env.NODE_ENV
 }
+// 静态服务文件地址
+let staticURL = 'http://static.patzn.com'
+console.log('process.env.STATIC_URL==', process.env.STATIC_URL)
+if (process.env.STATIC_URL) {
+  // 取各个配置文件中的 STATIC_URL
+  staticURL = process.env.STATIC_URL
+}
 module.exports = {
   mode: 'universal',
   server: {
@@ -22,13 +29,14 @@ module.exports = {
       { hid: 'description', name: 'description', content: pkg.description }
     ],
     script: [
-      { src: 'http://static.patzn.com/js/jquery-3.3.1.min.js' },
+      { src: staticURL + '/js/jquery-3.3.1.min.js' },
       {
         src:
-          'http://static.patzn.com/thirdparty/ztree/zTree_v3-3.5.29/js/jquery.ztree.all.min.js'
+          staticURL +
+          '/thirdparty/ztree/zTree_v3-3.5.29/js/jquery.ztree.all.min.js'
       },
       {
-        src: 'http://static.patzn.com/thirdparty/layx/layx-2.5.3.min.js'
+        src: staticURL + '/thirdparty/layx/layx-2.5.3.min.js'
       },
       {
         src:
@@ -39,29 +47,30 @@ module.exports = {
       {
         rel: 'icon',
         type: 'image/x-icon',
-        href: 'http://static.patzn.com/favicon.ico'
+        href: staticURL + '/favicon.ico'
       },
       {
         rel: 'stylesheet',
         href:
-          'http://static.patzn.com/thirdparty/ztree/zTree_v3-3.5.29/css/metroStyle/metroStyle.css'
+          staticURL +
+          '/thirdparty/ztree/zTree_v3-3.5.29/css/metroStyle/metroStyle.css'
       },
       {
         rel: 'stylesheet',
-        href: 'http://static.patzn.com/thirdparty/ztree/menuStyle.css'
+        href: staticURL + '/thirdparty/ztree/menuStyle.css'
       },
       {
         rel: 'stylesheet',
-        href: 'http://static.patzn.com/css/animate.css'
+        href: staticURL + '/css/animate.css'
       },
       {
         rel: 'stylesheet',
-        href: 'http://static.patzn.com/theme/my-theme/main.css'
+        href: staticURL + '/theme/my-theme/main.css'
       },
       { rel: 'stylesheet', href: '', name: 'theme' },
       {
         rel: 'stylesheet',
-        href: 'http://static.patzn.com/thirdparty/layx/layx-2.5.3.min.css'
+        href: staticURL + '/thirdparty/layx/layx-2.5.3.min.css'
       }
     ]
   },

pages/soil-test-manage/test-input/SoilAppendix.vue

@@ -3,35 +3,35 @@
     <Row>
       <!--查询-->
       <Col span="24">
-        <Form v-show="searchOpen" :label-width="80" inline onsubmit="return false">
+        <Form :label-width="80" v-show="searchOpen" inline onsubmit="return false">
           <label class="label-sign"></label>
           <Form-item class="search-item" label="模板名称:">
-            <Input v-model="formObj.title" placeholder="请输入模板名称" clearable @on-enter="_formSearch"></Input>
+            <Input v-model="formObj.title" @on-enter="_formSearch" placeholder="请输入模板名称" clearable></Input>
           </Form-item>
           <Form-item class="search-item" label="委托编号:">
-            <Input v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"></Input>
+            <Input v-model="formObj.entrustCode" @on-enter="_formSearch" placeholder="请输入委托编号" clearable></Input>
           </Form-item>
           <Form-item class="search-btn">
-            <Button type="primary" @click="_formSearch">搜索</Button>
+            <Button @click="_formSearch" type="primary">搜索</Button>
           </Form-item>
         </Form>
       </Col>
       <!--操作-->
       <Col span="24">
-        <btn-list  :open="searchOpen" :show-search-btn="true" class="contHide"
-                 @on-result-change="_btnClick"></btn-list>
+        <btn-list  :open="searchOpen" :msg="btn" :showSearchBtn="true" @on-result-change="_btnClick"
+                 class="contHide"></btn-list>
       </Col>
       <!-- 表格 -->
       <Col span="24">
-        <PTVXETable ref="pageTable" :table-height="tableHeight"
-                    :icon-msg="iconMsg" :get-page="getPage" @on-result-change="_tableResultChange">
+        <PTVXETable ref="pageTable" :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage">
           <vxe-table-column
-            v-for="item in pageColumns"
-            :key="item.key"
             :field="item.key"
             :title="item.title"
             :min-width="item.width?item.width:200"
-            :fixed="item.fixed?item.fixed:undefined" sortable>
+            :fixed="item.fixed?item.fixed:undefined"
+            v-for="item in pageColumns"
+            :key="item.key" sortable>
             <template slot-scope="scope">
               <div v-if="item.dateTime">
                 {{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM'):''}}
@@ -64,7 +64,7 @@ export default {
     return {
       currentComponent: '',
       getPage: {},
-      btn: [],
+      btn: [{ type: 'error', id: '', name: '批量删除' }],
       selectIds: [],
       iconMsg: [
         {
@@ -114,12 +114,35 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (msg) {
+          case '批量删除':
+            this._batchDelete()
+            break
           case 'search':
             this.searchOpen = !this.searchOpen
             break
         }
       })
     },
+    _batchDelete() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定删除？',
+          onOk: () => {
+            this._delete()
+          }
+        })
+      }
+    },
+    _delete: async function() {
+      const result = await soilTest.appendixDelete(this.selectIds.join(','))
+      if (result) {
+        this.$Message.success('删除成功')
+        this._page()
+      }
+    },
     _iconClick(res, data, currentComponent) {
       this.currentComponent = currentComponent
       this.$nextTick(() => {