第三方功能样式修改

src/views/thirdSys/corps/thrCorpSelect.vue

@@ -5,22 +5,12 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="单位编码:">
-              <el-input
+              <el-input v-model="filterQuery.unitId" placeholder="请输入往来单位编码" style="width: 90%" clearable></el-input>
-                v-model="filterQuery.unitId"
-                placeholder="请输入往来单位编码"
-                style="width: 90%"
-                clearable
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="往来单位:">
-              <el-input
+              <el-input v-model="filterQuery.name" placeholder="请输入往来单位" style="width: 90%" clearable></el-input>
-                v-model="filterQuery.name"
-                placeholder="请输入往来单位"
-                style="width: 90%"
-                clearable
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -46,29 +36,17 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
-          <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0"
+          <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0">选中导出</el-button>
-          >选中导出
+          <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0">结果全部导出</el-button>
-          </el-button>
+          <el-button type="primary" icon="el-icon-top-upload" @click="selectUpload" v-if="selectType==1">选中上传</el-button>
-          <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0"
+          <el-button type="primary" icon="el-icon-top-upload" @click="allUpload" v-if="selectType==1">一键上传</el-button>
-          >结果全部导出
+          <el-button type="primary" icon="el-icon-download" @click="downloadErp" v-if="selectType==3">选中下载</el-button>
-          </el-button>
+          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3">结果全部下载</el-button>
-          <el-button type="primary" icon="el-icon-top-upload" @click="selectUpload"
-                     v-if="selectType==1"
-          >选中上传
-          </el-button>
-          <el-button type="primary" icon="el-icon-top-upload" @click="allUpload"
-                     v-if="selectType==1"
-          >一键上传
-          </el-button>
-          <el-button type="primary" icon="el-icon-download" @click="downloadErp" v-if="selectType==3"
-          >选中下载
-          </el-button>
-          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3"
-          >结果全部下载
-          </el-button>
         </el-button-group>
       </div>
+
       <el-divider style="margin: 15px"></el-divider>
+
       <el-table v-loading="loading" :data="list"
                 style="width: 100%"
                 @selection-change="handleSelectionChange"

src/views/thirdSys/corps/thrCorps.vue

@@ -5,22 +5,12 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="单位编码:">
-              <el-input
+              <el-input v-model="filterQuery.unitId" placeholder="请输入往来单位编码" style="width: 90%" clearable></el-input>
-                v-model="filterQuery.unitId"
-                placeholder="请输入往来单位编码"
-                style="width: 90%"
-                clearable
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="往来单位:">
-              <el-input
+              <el-input v-model="filterQuery.name" placeholder="请输入往来单位" style="width: 90%" clearable></el-input>
-                v-model="filterQuery.name"
-                placeholder="请输入往来单位"
-                style="width: 90%"
-                clearable
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">

src/views/thirdSys/corps/thrCorpsExport.vue

@@ -20,59 +20,21 @@
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
-      <el-table
+      <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border highlight-current-row>
-        v-loading="loading"
-        :data="list"
-        style="width: 100%"
-        @selection-change="handleSelectionChange"
-        border highlight-current-row
-      >
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
+        <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
-          label="记录ID"
+        <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
-          prop="genKey"
+        <el-table-column label="状态" prop="status" show-overflow-tooltip>
-          show-overflow-tooltip
-        ></el-table-column>
-
-
-        <el-table-column
-          label="更新日期"
-          prop="updateTime"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="状态"
-          prop="status"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
-            <el-tag
+            <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
-              :type="statusFilterType(scope.row.status)"
-            >{{ status[scope.row.status] }}
-            </el-tag
-            >
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="下载次数" prop="dlCount" show-overflow-tooltip>
-          label="下载次数"
-          prop="dlCount"
-          show-overflow-tooltip
-        >
         </el-table-column>
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="text" @click.native.stop="downloadExcel(scope.row)">下载</el-button>
-              type="text"
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
-              @click.native.stop="downloadExcel(scope.row)"
-            >下载
-            </el-button
-            >
-            <el-button
-              type="text"
-              @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>

src/views/thirdSys/corps/thrCorpsExportSmp.vue

@@ -19,58 +19,21 @@
       </el-button-group>
     </div>
 
-    <el-table
+    <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange">
-      v-loading="loading"
-      :data="list"
-      style="width: 100%"
-      @selection-change="handleSelectionChange"
-    >
       <el-table-column label="序号" type="index"></el-table-column>
-      <el-table-column
+      <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
-        label="记录ID"
+      <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
-        prop="genKey"
+      <el-table-column label="状态" prop="status" show-overflow-tooltip>
-        show-overflow-tooltip
-      ></el-table-column>
-
-
-      <el-table-column
-        label="更新日期"
-        prop="updateTime"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        label="状态"
-        prop="status"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          <el-tag
+          <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
-            :type="statusFilterType(scope.row.status)"
-          >{{ status[scope.row.status] }}
-          </el-tag
-          >
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="下载次数" prop="dlCount" show-overflow-tooltip>
-        label="下载次数"
-        prop="dlCount"
-        show-overflow-tooltip
-      >
       </el-table-column>
       <el-table-column label="操作" fixed="right" width="120">
         <template slot-scope="scope">
-          <el-button
+          <el-button type="text" @click.native.stop="downloadExcel(scope.row)">下载</el-button>
-            type="text"
+          <el-button type="text" @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
-            @click.native.stop="downloadExcel(scope.row)"
-          >下载
-          </el-button
-          >
-          <el-button
-            type="text"
-            @click.native.stop="deleteDialog(scope.row.id)"
-          >删除
-          </el-button
-          >
         </template>
       </el-table-column>
     </el-table>

src/views/thirdSys/corps/thrCorpsImport.vue

@@ -63,74 +63,26 @@
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
-      <el-table
+      <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
-        v-loading="loading"
-        :data="list"
-        style="width: 100%"
-        @selection-change="handleSelectionChange"
-        border highlight-current-row
-      >
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
+        <el-table-column label="记录ID" show-overflow-tooltip></el-table-column>
-          label="记录ID"
+        <el-table-column label="来源" prop="fromType" show-overflow-tooltip></el-table-column>
-          prop="genKey"
+        <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
-          show-overflow-tooltip
+        <el-table-column label="来源系统" prop="thirdSysFk" show-overflow-tooltip :formatter="formatterThirdSys"></el-table-column>
-        ></el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
-
+        <el-table-column label="状态" prop="status" show-overflow-tooltip>
-        <el-table-column
-          label="来源"
-          prop="fromType"
-          show-overflow-tooltip
-        >
-        </el-table-column>
-        <el-table-column
-          label="更新日期"
-          prop="updateTime"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="来源系统"
-          prop="thirdSysFk"
-          show-overflow-tooltip
-          :formatter="formatterThirdSys"
-        ></el-table-column>
-
-        <el-table-column
-          label="备注"
-          prop="remark"
-          show-overflow-tooltip
-        ></el-table-column>
-
-        <el-table-column
-          label="状态"
-          prop="status"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
-            <el-tag
+            <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
-              :type="statusFilterType(scope.row.status)"
-            >{{ status[scope.row.status] }}
-            </el-tag
-            >
           </template>
         </el-table-column>
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="text" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
-              type="text"
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
-              @click.native.stop="handleDetailClick(scope.row)"
-            >详情
-            </el-button
-            >
-            <el-button
-              type="text"
-              @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
+
       <el-dialog
         title="导入往来单位详情"
         :visible.sync="udiImportDetailVisible"

src/views/thirdSys/corps/thrCorpsImportDetail.vue

@@ -5,22 +5,12 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="往来单位编码:">
-              <el-input
+              <el-input v-model="filterQuery.unitId" style="width: 90%" placeholder="请输入往来单位编码" clearable></el-input>
-                v-model="filterQuery.unitId"
-                style="width: 90%"
-                placeholder="请输入往来单位编码"
-                clearable
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="往来单位:">
-              <el-input
+              <el-input v-model="filterQuery.name" style="width: 90%" placeholder="请输入往来单位" clearable></el-input>
-                v-model="filterQuery.name"
-                style="width: 90%"
-                placeholder="请输入往来单位"
-                clearable
-              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>

src/views/thirdSys/invProducts/thrInvProducts.vue

@@ -5,49 +5,29 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="产品编码:">
-              <el-input
+              <el-input v-model="filterQuery.inventoryCode" clearable style="width: 90%" placeholder="请输入产品编码"></el-input>
-                v-model="filterQuery.inventoryCode" clearable
-                style="width: 90%"
-                placeholder="请输入产品编码"
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="产品名称:">
-              <el-input
+              <el-input v-model="filterQuery.inventoryName" clearable style="width: 90%" placeholder="请输入产品名称"></el-input>
-                v-model="filterQuery.inventoryName" clearable
-                style="width: 90%"
-                placeholder="请输入产品名称"
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格型号:">
-              <el-input
+              <el-input v-model="filterQuery.spec" clearable style="width: 90%" placeholder="请输入规格型号"></el-input>
-                v-model="filterQuery.spec" clearable
-                style="width: 90%"
-                placeholder="请输入规格型号"
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label-width="120px"  label="注册/备案凭证号:">
-              <el-input
+              <el-input v-model="filterQuery.registerCertNo" clearable style="width: 90%" placeholder="请输入注册/备案凭证号"></el-input>
-                v-model="filterQuery.registerCertNo" clearable
-                style="width: 90%"
-                placeholder="请输入注册/备案凭证号"
-              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
             <el-form-item label="生厂厂家:">
-              <el-input
+              <el-input v-model="filterQuery.manufactory" clearable style="width: 90%" placeholder="请输入生厂厂家"></el-input>
-                v-model="filterQuery.manufactory" clearable
-                style="width: 90%"
-                placeholder="请输入生厂厂家"
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -63,8 +43,7 @@
             <el-form-item label="外部系统:">
 
               <el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统">
-                <el-option
+                <el-option v-for="item in thirdSys"
-                  v-for="item in thirdSys"
                   :key="item.value"
                   :label="item.thirdName"
                   :value="item.thirdId">

src/views/thirdSys/order/thrOrder.vue

@@ -5,22 +5,12 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="单据号:">
-              <el-input
+              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
-                v-model="filterQuery.billNo"
-                style="width: 90%"
-                placeholder="请输入单据号"
-                clearable
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="往来单位:">
-              <el-input
+              <el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来单位" clearable></el-input>
-                v-model="filterQuery.corpName"
-                style="width: 90%"
-                placeholder="请输入往来单位"
-                clearable
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">

src/views/thirdSys/order/thrOrderExport.vue

@@ -29,51 +29,17 @@
         border highlight-current-row
       >
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
+        <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
-          label="记录ID"
+        <el-table-column label="更新日期"prop="updateTime" show-overflow-tooltip></el-table-column>
-          prop="genKey"
+        <el-table-column label="状态" prop="status" show-overflow-tooltip>
-          show-overflow-tooltip
+        <template slot-scope="scope">
-        ></el-table-column>
+          <el-tag  :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
-
-
-        <el-table-column
-          label="更新日期"
-          prop="updateTime"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="状态"
-          prop="status"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <el-tag
-              :type="statusFilterType(scope.row.status)"
-            >{{ status[scope.row.status] }}
-            </el-tag
-            >
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="下载次数" prop="dlCount" show-overflow-tooltip></el-table-column>
-          label="下载次数"
-          prop="dlCount"
-          show-overflow-tooltip
-        >
-        </el-table-column>
         <el-table-column label="操作" width="120">
-          <template slot-scope="scope">
+          <template slot-scope="scope"><el-button type="text" @click.native.stop="downloadExcel(scope.row)">下载</el-button>
-            <el-button
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
-              type="text"
-              @click.native.stop="downloadExcel(scope.row)"
-            >下载
-            </el-button
-            >
-            <el-button
-              type="text"
-              @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>

src/views/thirdSys/order/thrOrderExportSmp.vue

@@ -21,54 +21,19 @@
       </div>
       <el-divider style="margin: 15px"></el-divider>
 
-      <el-table
+      <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
-        v-loading="loading"
-        :data="list"
-        style="width: 100%"
-        @selection-change="handleSelectionChange"
-        border highlight-current-row
-      >
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
+        <el-table-column label="记录ID"prop="genKey" show-overflow-tooltip></el-table-column>
-          label="记录ID"
+        <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
-          prop="genKey"
+        <el-table-column label="状态" prop="status" show-overflow-tooltip>
-          show-overflow-tooltip
-        ></el-table-column>
-
-
-        <el-table-column
-          label="更新日期"
-          prop="updateTime"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="状态"
-          prop="status"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
-            <el-tag
+            <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
-              :type="statusFilterType(scope.row.status)"
-            >{{ status[scope.row.status] }}
-            </el-tag
-            >
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="下载次数" prop="dlCount" show-overflow-tooltip></el-table-column>
-          label="下载次数"
-          prop="dlCount"
-          show-overflow-tooltip
-        >
-        </el-table-column>
         <el-table-column label="操作" width="60">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
-              type="text"
-              size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>

src/views/thirdSys/order/thrOrderImport.vue

@@ -60,75 +60,26 @@
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
-      <el-table
+      <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
-        v-loading="loading"
-        :data="list"
-        style="width: 100%"
-        @selection-change="handleSelectionChange"
-        border highlight-current-row
-      >
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
+        <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
-          label="记录ID"
+        <el-table-column label="来源" prop="fromType" show-overflow-tooltip></el-table-column>
-          prop="genKey"
+        <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
-          show-overflow-tooltip
+        <el-table-column label="来源系统" prop="thirdSysFk" :formatter="formatterThirdSys" show-overflow-tooltip></el-table-column>
-        ></el-table-column>
+        <el-table-column label="状态" prop="status" show-overflow-tooltip>
-
-        <el-table-column
-          label="来源"
-          prop="fromType"
-          show-overflow-tooltip
-        >
-        </el-table-column>
-        <el-table-column
-          label="更新日期"
-          prop="updateTime"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="来源系统"
-          prop="thirdSysFk"
-          :formatter="formatterThirdSys"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="状态"
-          prop="status"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
-            <el-tag
+            <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
-              :type="statusFilterType(scope.row.status)"
-            >{{ status[scope.row.status] }}
-            </el-tag
-            >
           </template>
         </el-table-column>
-
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
-        <el-table-column
-          label="备注"
-          prop="remark"
-          show-overflow-tooltip
-        ></el-table-column>
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
-              type="text"
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
-              size="small"
-              @click.native.stop="handleDetailClick(scope.row)"
-            >详情
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
+
       <el-dialog
         title="导入订单详情"
         :visible.sync="udiImportDetailVisible"

src/views/thirdSys/order/thrOrderSelect.vue

@@ -5,22 +5,11 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="单据号:">
-              <el-input
+              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input></el-form-item>
-                v-model="filterQuery.billNo"
-                style="width: 90%"
-                placeholder="请输入单据号"
-                clearable
-              ></el-input>
-            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="往来单位:">
-              <el-input
+              <el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来单位" clearable></el-input>
-                v-model="filterQuery.corpName"
-                style="width: 90%"
-                placeholder="请输入往来单位"
-                clearable
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -63,30 +52,16 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
-          <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0"
+          <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0">选中导出</el-button>
-          >选中导出
+          <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0">结果全部导出</el-button>
-          </el-button>
+          <el-button type="primary" icon="el-icon-top-upload" @click="uploadSMP" v-if="selectType==1">选中上传</el-button>
-          <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0"
+          <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSMP" v-if="selectType==1">一键上传</el-button>
-          >结果全部导出
+          <el-button type="primary" icon="el-icon-download" @click="downloadErp" v-if="selectType==3">选中下载</el-button>
-          </el-button>
+          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3">结果全部下载</el-button>
-          <el-button type="primary" icon="el-icon-top-upload" @click="uploadSMP"
-                     v-if="selectType==1"
-          >选中上传
-          </el-button>
-          <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSMP"
-                     v-if="selectType==1"
-          >一键上传
-          </el-button>
-          <el-button type="primary" icon="el-icon-download" @click="downloadErp" v-if="selectType==3"
-          >选中下载
-          </el-button>
-          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3"
-          >结果全部下载
-          </el-button>
         </el-button-group>
       </div>
-      <el-divider style="margin: 15px"></el-divider>
 
+      <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
                 @selection-change="handleSelectionChange"
                 @current-change="handleDetail">

src/views/thirdSys/product/thrProducts.vue

@@ -5,50 +5,29 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="产品编码:">
-              <el-input
+              <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable @keyup.enter.native="keyupErp_submit($event)"></el-input>
-                v-model="filterQuery.code"
-                style="width: 90%"
-                placeholder="请输入产品编码/商品条码/医保编码" clearable
-                @keyup.enter.native="keyupErp_submit($event)"
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="产品名称:">
-              <el-input
+              <el-input v-model="filterQuery.name" clearable style="width: 90%" placeholder="请输入产品名称"></el-input>
-                v-model="filterQuery.name" clearable
-                style="width: 90%"
-                placeholder="请输入产品名称"
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格型号:">
-              <el-input
+              <el-input v-model="filterQuery.spec" clearable style="width: 90%" placeholder="请输入规格型号"></el-input>
-                v-model="filterQuery.spec" clearable
-                style="width: 90%"
-                placeholder="请输入规格型号"
-              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
             <el-form-item label="注册/备案凭证:">
-              <el-input
+              <el-input v-model="filterQuery.registerNo" clearable style="width: 90%" placeholder="请输入注册/备案凭证"></el-input>
-                v-model="filterQuery.registerNo" clearable
-                style="width: 90%"
-                placeholder="请输入注册/备案凭证"
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="生产厂家:">
-              <el-input
+              <el-input v-model="filterQuery.manufactory" clearable style="width: 90%" placeholder="请输入生产厂家"></el-input>
-                v-model="filterQuery.manufactory" clearable
-                style="width: 90%"
-                placeholder="请输入生产厂家"
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -75,12 +54,12 @@
             <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true"
+            <el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true" :disabled="!configParms.basicThirdProducts">新增</el-button>
-                       :disabled="!configParms.basicThirdProducts">新增
-            </el-button>
           </el-button-group>
         </div>
+
       <el-divider style="margin: 15px"></el-divider>
+
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="80"></el-table-column>
         <el-table-column label="产品编码" prop="code"></el-table-column>
@@ -91,16 +70,14 @@
         <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="180px">
           <template slot-scope="scope">
-            <el-button type="text" @click.native.stop="detailDialog(scope.row)"
+            <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
-            >详情
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row)" v-if="thirdSysDetail.fromType!=0" :disabled="!configParms.basicThirdProducts">删除
-            </el-button>
-            <el-button type="text" @click.native.stop="deleteDialog(scope.row)"
-                       v-if="thirdSysDetail.fromType!=0" :disabled="!configParms.basicThirdProducts"
-            >删除
             </el-button>
           </template>
         </el-table-column>
       </el-table>
+
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -109,6 +86,7 @@
         @pagination="getList"
       ></pagination>
     </el-card>
+
     <el-dialog
       :close-on-click-modal="false"
       :close-on-press-escape="false"

src/views/thirdSys/product/thrProductsAdd.vue

@@ -24,156 +24,83 @@
                 <el-row type="flex">
                     <el-col :span="11" type="flex">
                           <el-form-item label="产品编码:" prop="code">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入产品编码" v-model.trim="newProductData.code"></el-input></el-form-item>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入产品编码"
-                                v-model.trim="newProductData.code"
-                            ></el-input>
-                          </el-form-item>
                     </el-col>
                     <el-col :span="11" type="flex">
                       <el-form-item label="产品名称:" prop="name">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入产品名称" v-model.trim="newProductData.name"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入产品名称"
-                                v-model.trim="newProductData.name"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row  type="flex">
                     <el-col :span="11" class="el-col">
                       <el-form-item label="规格型号:" prop="spec">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入规格型号" v-model.trim="newProductData.spec"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入规格型号"
-                                v-model.trim="newProductData.spec"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
-
                     <el-col :span="11" class="el-col">
                       <el-form-item label="计量单位:" prop="measname">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入计量单位" v-model.trim="newProductData.measname"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入计量单位"
-                                v-model.trim="newProductData.measname"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row  type="flex">
                     <el-col :span="11" class="el-col">
                           <el-form-item label="生产厂家:" prop="manufactory">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入生产厂家" v-model.trim="newProductData.manufactory"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入生产厂家"
-                                v-model.trim="newProductData.manufactory"
-                            ></el-input>
                           </el-form-item>
                     </el-col>
                     <el-col :span="11" class="el-col">
                       <el-form-item label="注册证号:" prop="registerNo">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入注册证号" v-model.trim="newProductData.registerNo"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入注册证号"
-                                v-model.trim="newProductData.registerNo"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row type="flex">
                     <el-col :span="11" class="el-col">
                       <el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入医疗器械注册人" v-model.trim="newProductData.ylqxzcrbarmc"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入医疗器械注册人"
-                                v-model.trim="newProductData.ylqxzcrbarmc"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="11" class="el-col">
                       <el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入注册人英文名称" v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入注册人英文名称"
-                                v-model.trim="newProductData.ylqxzcrbarywmc"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
-
                 </el-row>
                 <el-row  type="flex">
                     <el-col :span="11" class="el-col">
                       <el-form-item label="产品类别:" prop="cplb">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入产品类别" v-model.trim="newProductData.cplb"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入产品类别"
-                                v-model.trim="newProductData.cplb"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="11" class="el-col">
                       <el-form-item label="分类编码:" prop="flbm">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入分类编码" v-model.trim="newProductData.flbm"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入分类编码"
-                                v-model.trim="newProductData.flbm"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row  type="flex">
                     <el-col :span="11" class="el-col">
                       <el-form-item label="商品条码:" prop="sptm">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入商品条码" v-model.trim="newProductData.sptm"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入商品条码"
-                                v-model.trim="newProductData.sptm"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="11" class="el-col">
                       <el-form-item label="医保编码:" prop="ybbm">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入医保编码" v-model.trim="newProductData.ybbm"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入医保编码"
-                                v-model.trim="newProductData.ybbm"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row type="flex">
                     <el-col :span="11" class="el-col">
                       <el-form-item label="统一社会信用号:" prop="tyshxydm">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号" v-model.trim="newProductData.tyshxydm"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入统一社会信用号"
-                                v-model.trim="newProductData.tyshxydm"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="11" class="el-col">
                       <el-form-item label="器械类别:" prop="qxlb">
-                            <el-input
+                            <el-input style="width: 90%" size="small" placeholder="请输入器械类别" v-model.trim="newProductData.qxlb"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                placeholder="请输入器械类别"
-                                v-model.trim="newProductData.qxlb"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                 </el-row>
@@ -181,14 +108,7 @@
                 <el-row  type="flex">
                     <el-col :span="23" class="el-col">
                       <el-form-item label="产品描述:" prop="cpms">
-                            <el-input
+                            <el-input style="width: 92%" type="textarea" size="mini" rows="3" placeholder="请输入产品描述" v-model.trim="newProductData.cpms"></el-input>
-                                style="width: 92%"
-                                type="textarea"
-                                size="mini"
-                                rows="3"
-                                placeholder="请输入产品描述"
-                                v-model.trim="newProductData.cpms"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                 </el-row>

src/views/thirdSys/product/thrProductsDetail.vue

@@ -4,181 +4,99 @@
                 <el-row type="flex">
                     <el-col :span="11" class="el-col">
                       <el-form-item label="第三方系统" prop="thirdSysFk">
-                            <el-input
+                            <el-input style="width: 90%" size="small" :disabled="true" v-model="data.thirdSysName"></el-input>
-                                style="width: 90%"
-                                size="small"
-                                :disabled="true"
-                                v-model="data.thirdSysName"
-                            ></el-input>
                       </el-form-item>
                     </el-col>
                 </el-row>
               <el-row type="flex">
                 <el-col :span="11" type="flex">
                   <el-form-item label="产品编码:" prop="code">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.code"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.code"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="11" type="flex">
                   <el-form-item label="产品名称:" prop="name">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.name"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.name"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row  type="flex">
                 <el-col :span="11" class="el-col">
                   <el-form-item label="生产厂家:" prop="manufactory">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.manufactory"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.manufactory"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="11" class="el-col">
                   <el-form-item label="注册证号:" prop="registerNo">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.registerNo"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.registerNo"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row  type="flex">
                 <el-col :span="11" class="el-col">
                   <el-form-item label="规格型号:" prop="spec">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.spec"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.spec"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="11" class="el-col">
                   <el-form-item label="计量单位:" prop="measname">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.measname"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.measname"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row type="flex">
                 <el-col :span="11" class="el-col">
                   <el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.ylqxzcrbarmc"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.ylqxzcrbarmc"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="11" class="el-col">
                   <el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.ylqxzcrbarywmc"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.ylqxzcrbarywmc"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row  type="flex">
                 <el-col :span="11" class="el-col">
                   <el-form-item label="产品类别:" prop="cplb">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.cplb"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.cplb"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="11" class="el-col">
                   <el-form-item label="分类编码:" prop="flbm">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.flbm"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.flbm"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row  type="flex">
                 <el-col :span="11" class="el-col">
                   <el-form-item label="商品条码:" prop="sptm">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.sptm"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.sptm"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="11" class="el-col">
                   <el-form-item label="医保编码:" prop="ybbm">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.ybbm"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.ybbm"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row type="flex">
                 <el-col :span="11" class="el-col">
                   <el-form-item label="统一社会信用号:" prop="tyshxydm">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.tyshxydm"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.tyshxydm"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="11" class="el-col">
                   <el-form-item label="器械类别:" prop="qxlb">
-                    <el-input
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.qxlb"></el-input>
-                      style="width: 90%"
-                      size="small"
-                      :disabled="true"
-                      v-model.trim="data.qxlb"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row  type="flex">
                 <el-col :span="23" class="el-col">
                   <el-form-item label="产品描述:" prop="cpms">
-                    <el-input
+                    <el-input style="width: 92%" type="textarea" size="mini" rows="3" :disabled="true" v-model.trim="data.cpms"></el-input>
-                      style="width: 92%"
-                      type="textarea"
-                      size="mini"
-                      rows="3"
-                      :disabled="true"
-                      v-model.trim="data.cpms"
-                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>

src/views/thirdSys/product/thrProductsExport.vue

@@ -27,54 +27,24 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
+        <el-table-column label="记录ID" prop="genKey"></el-table-column>
-          label="记录ID"
+        <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
-          prop="genKey"
+        <el-table-column label="状态" prop="status" show-overflow-tooltip>
-          show-overflow-tooltip
-        ></el-table-column>
-
-
-        <el-table-column
-          label="更新日期"
-          prop="updateTime"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="状态"
-          prop="status"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
-            <el-tag
+            <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
-              :type="statusFilterType(scope.row.status)"
-            >{{ status[scope.row.status] }}
-            </el-tag
-            >
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="下载次数" prop="dlCount" show-overflow-tooltip>
-          label="下载次数"
-          prop="dlCount"
-          show-overflow-tooltip
-        >
         </el-table-column>
         <el-table-column label="操作"  width="120">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="text" @click.native.stop="downloadExcel(scope.row)">下载
-              type="text"
+            </el-button>
-              @click.native.stop="downloadExcel(scope.row)"
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
-            >下载
-            </el-button
-            >
-            <el-button
-              type="text"
-              @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
+
       <pagination
         v-show="total>0"
         :total="total"

src/views/thirdSys/product/thrProductsImport.vue

@@ -68,66 +68,26 @@
         border highlight-current-row
       >
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
+        <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
-          label="记录ID"
+        <el-table-column label="来源" prop="fromType" show-overflow-tooltip></el-table-column>
-          prop="genKey"
+        <el-table-column label="更新日期" prop="updateTime" show-overflow-tooltip></el-table-column>
-          show-overflow-tooltip
+        <el-table-column label="来源系统" prop="thirdSysFk" show-overflow-tooltip :formatter="formatterThirdSys"></el-table-column>
-        ></el-table-column>
+        <el-table-column label="状态" prop="status" show-overflow-tooltip>
-
-        <el-table-column
-          label="来源"
-          prop="fromType"
-          show-overflow-tooltip
-        >
-        </el-table-column>
-        <el-table-column
-          label="更新日期"
-          prop="updateTime"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="来源系统"
-          prop="thirdSysFk"
-          show-overflow-tooltip
-          :formatter="formatterThirdSys"
-        ></el-table-column>
-        <el-table-column
-          label="状态"
-          prop="status"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
-            <el-tag
+            <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}
-              :type="statusFilterType(scope.row.status)"
+            </el-tag>
-            >{{ status[scope.row.status] }}
-            </el-tag
-            >
           </template>
         </el-table-column>
 
-        <el-table-column
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
-          label="备注"
-          prop="remark"
-          show-overflow-tooltip
-        ></el-table-column>
-
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="text" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
-              type="text"
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row.id)">删除</el-button>
-              @click.native.stop="handleDetailClick(scope.row)"
-            >详情
-            </el-button
-            >
-            <el-button
-              type="text"
-              @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
+
       <pagination
         v-show="total>0"
         :total="total"

src/views/thirdSys/product/thrProductsImportDetail.vue

@@ -4,16 +4,9 @@
             <el-form :inline="true" :model="query" size="mini">
                 <el-row>
                     <el-form-item class="query-form-item">
-                        <el-input
+                        <el-input v-model="filterQuery.code" placeholder="请输入产品编码"></el-input></el-form-item>
-                            v-model="filterQuery.code"
-                            placeholder="请输入产品编码"
-                        ></el-input>
-                    </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input
+                        <el-input v-model="filterQuery.name" placeholder="请输入产品名称"></el-input>
-                            v-model="filterQuery.name"
-                            placeholder="请输入产品名称"
-                        ></el-input>
                     </el-form-item>
                     <el-form-item>
                         <el-button-group style="display:flex;">

src/views/thirdSys/product/thrProductsSelect.vue

@@ -5,56 +5,34 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="产品编码:">
-              <el-input
+              <el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" style="width: 90%" @keyup.enter.native="keyupErp_submit($event)"></el-input>
-                v-model="filterQuery.code"
-                placeholder="请输入产品编码/商品条码/医保编码"
-                style="width: 90%"
-                @keyup.enter.native="keyupErp_submit($event)"
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="产品名称:">
-              <el-input
+              <el-input v-model="filterQuery.name" style="width: 90%" placeholder="请输入产品名称"></el-input>
-                v-model="filterQuery.name"
-                style="width: 90%"
-                placeholder="请输入产品名称"
-              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格型号:">
-              <el-input
+              <el-input v-model="filterQuery.spec" clearable="true" style="width: 90%" placeholder="请输入规格型号"></el-input>
-                v-model="filterQuery.spec" clearable="true"
-                style="width: 90%"
-                placeholder="请输入规格型号"
-              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
         <el-col :span="6">
           <el-form-item label="注册/备案凭证:">
-            <el-input
+            <el-input v-model="filterQuery.registerNo" clearable="true" style="width: 90%" placeholder="请输入注册/备案凭证"></el-input>
-              v-model="filterQuery.registerNo" clearable="true"
-              style="width: 90%"
-              placeholder="请输入注册/备案凭证"
-            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="生产厂家:">
-            <el-input
+            <el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%" placeholder="请输入生产厂家"></el-input>
-              v-model="filterQuery.manufactory" clearable="true"
-              style="width: 90%"
-              placeholder="请输入生产厂家"
-            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="外部系统:">
-            <el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统"
+            <el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统" @change="thirdSysChange">
-                       @change="thirdSysChange">
               <el-option
                 v-for="item in thirdSys"
                 :key="item.value"
@@ -74,30 +52,12 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
-          <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0"
+          <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0">选中导出</el-button>
-          >选中导出
+          <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0">结果全部导出</el-button>
-          </el-button>
+          <el-button type="primary" icon="el-icon-top-upload" @click="uploadSmp" v-if="selectType==1">选中上传</el-button>
-          <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0"
+          <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSmp" v-if="selectType==1">一键上传</el-button>
-          >结果全部导出
+          <el-button type="primary" icon="el-icon-download" @click="downloadErp" v-if="selectType==3">选中下载</el-button>
-          </el-button>
+          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3">结果全部下载</el-button>
-          <el-button type="primary" icon="el-icon-top-upload" @click="uploadSmp"
-                     v-if="selectType==1"
-          >选中上传
-          </el-button>
-          <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSmp"
-                     v-if="selectType==1"
-          >一键上传
-          </el-button>
-
-          <el-button type="primary" icon="el-icon-download" @click="downloadErp"
-                     v-if="selectType==3"
-          >选中下载
-          </el-button>
-          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp"
-                     v-if="selectType==3"
-          >结果全部下载
-          </el-button>
-
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
@@ -115,9 +75,7 @@
         <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="60">
           <template slot-scope="scope">
-            <el-button type="text" @click.native.stop="detailDialog(scope.row)"
+            <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
-            >详情
-            </el-button>
             <!--<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"-->
             <!--&gt;删除-->
             <!--</el-button>-->