委托查询前端

itdmWeb/src/views/module-iTDM/gongdanshuju/ItdmGongdanShujuList.vue

@@ -27,7 +27,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="频次">
-                <a-input placeholder="请输入频次" v-model="queryParam.pinci"></a-input>
+                <a-input placeholder="请输入频次（分钟）" v-model="queryParam.pinci"></a-input>
               </a-form-item>
             </a-col>
           </template>
@@ -172,11 +172,11 @@
           //   align:"center",
           //   dataIndex: 'woId'
           // },
-          // {
-          //   title:'试验类型',
-          //   align:"center",
-          //   dataIndex: 'shiyanType_dictText'
-          // },
+          {
+            title:'试验类型',
+            align:"center",
+            dataIndex: 'shiyanType_dictText'
+          },
           // {
           //   title:'试验开始时间',
           //   align:"center",
@@ -268,10 +268,11 @@
       create(){
         httpAction("/itdmgomgongdanshuju/ItdmGongdanshuju/create",this.queryParam,"post").then((res)=>{
           if(res.success){
-            that.$message.success(res.message);
-            that.$emit('ok');
+            console.log(res)
+            this.$message.success(res.message);
+            this.modalFormOk()
           }else{
-            that.$message.warning(res.message);
+            this.$message.warning(res.message);
           }
            this.searchReset();
         })

itdmWeb/src/views/module-iTDM/weituochaxun/ItdmWeituoYangpinList.vue

@@ -8,11 +8,27 @@
               <a-input placeholder="请输入委托单位名称" v-model="queryParam.weituoClient"></a-input>
             </a-form-item>
           </a-col> -->
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="委托单id">
-              <a-input placeholder="请输入委托id" v-model="queryParam.weituoId"></a-input>
-            </a-form-item>
+          <a-col :xl="7" :lg="7" :md="8" :sm="24">
+            <!-- <a-form-item label="委托单位名称">
+              <a-input placeholder="请输入委托单位名称" v-model="queryParam.weituoClient"></a-input>
+            </a-form-item> -->
+             <a-select
+              show-search
+              placeholder="请选择"
+              v-model="queryParam.id"
+              :filter-option="false"
+              :options="options"
+              :allow-clear="true"
+            >
+            </a-select>
+          </a-col>
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+           <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" v-model:value="queryParam.startTime" placeholder="请输入开始时间"/>
+          </a-col>
+           <a-col :xl="5" :lg="7" :md="8" :sm="24">
+           <a-date-picker  format="YYYY-MM-DD HH:mm:ss" v-model:value="queryParam.endTime" placeholder="请输入结束时间"/>
           </a-col>
+
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -165,6 +181,11 @@
             dataIndex: 'sampleQuantities'
           },
           {
+            title:'检测依据',
+            align:"center",
+            dataIndex:'judgementBasis'
+          },
+          {
             title:'生产厂家',
             align:"center",
             dataIndex: 'sampleManufacturer'

itdmWeb/src/views/module-iTDM/weituoshenhe/ItdmWeituoshenheInfoList.vue

@@ -9,11 +9,11 @@
               <a-input placeholder="请输入委托单位名称" v-model="queryParam.weituoClient"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="委托单位地址">
               <a-input placeholder="请输入委托单位地址" v-model="queryParam.weituoAddress"></a-input>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -30,14 +30,14 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
+    <!-- <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('委托信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -90,8 +90,8 @@
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">审核</a>
 
-          <!-- <a-divider type="vertical" />
-          <!-- <a-dropdown>
+             <a-divider type="vertical" />
+          <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
               <a-menu-item>
@@ -100,10 +100,10 @@
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
-                </a-popconfirm> -->
-              <!-- </a-menu-item>
+                </a-popconfirm>
+              </a-menu-item>
             </a-menu>
-          </a-dropdown> --> 
+          </a-dropdown>
         </span>
 
       </a-table>
@@ -206,12 +206,12 @@ export default {
           align:"center",
           dataIndex: 'shenheStatus_dictText'
         },
-        // {
-        //   title:'试验条件文件地址',
-        //   align:"center",
-        //   dataIndex: 'tiaojianFile',
-        //   scopedSlots: {customRender: 'fileSlot'}
-        // },
+        {
+          title:'试验条件文件地址',
+          align:"center",
+          dataIndex: 'tiaojianFile',
+          scopedSlots: {customRender: 'fileSlot'}
+        },
         {
           title: '操作',
           dataIndex: 'action',
@@ -222,7 +222,7 @@ export default {
         }
       ],
       url: {
-        list: "/weituo/itdmWeituoInfo/list",
+        list: "/weituo/itdmWeituoShenhe/list",
         
         delete: "/weituo/itdmWeituoInfo/delete",
         deleteBatch: "/weituo/itdmWeituoInfo/deleteBatch",