Parcourir la source

委托查询前端

110 il y a 2 ans
Parent
commit
4e66669640

+ 2 - 2
itdmWeb/src/api/api.js

@@ -69,7 +69,7 @@ const getXmjlList = (params) => getAction('/sych/XMJLList', params);
 // 项目经理拆单后的提交按钮
 const saveProjectJl = (params)=>postAction("/sych/XMJLAddOrUpdate",params)
 //生成
-const created = (params)=>getAction("/itdmgomgongdanshuju/ItdmGongdanshuju/create",params)
+const generate = (params)=>postAction("/itdmgomgongdanshuju/ItdmGongdanshuju/create",params)
 
 //日志管理
 const deleteLog = (params)=>deleteAction("/sys/log/delete",params);
@@ -183,7 +183,7 @@ export {
   saveProject,
   getXmjlList,
   saveProjectJl,
-  created
+  generate
 }
 
 

+ 35 - 15
itdmWeb/src/views/module-iTDM/gongdanshuju/ItdmGongdanShujuList.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="工单id">
-              <a-input placeholder="请输入工单id" v-model="queryParam.woId"></a-input>
+              <a-input placeholder="请输入工单id" values="123"  v-model="queryParam.woId"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -14,7 +14,7 @@
               <j-multi-select-tag placeholder="请选择试验类型" dictCode="shiiyan_type" v-model="queryParam.shiyanType"/>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
+           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="试验开始时间">
                 <a-input placeholder="请输入试验开始时间" v-model="queryParam.shiyanKaishitime"></a-input>
@@ -35,7 +35,7 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a-button type="primary" @click="searchQuery" icon="sengch" style="margin-left: 8px">生成</a-button>
+              <a-button type="primary" @click="create" icon="sengch" style="margin-left: 8px">生成</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
@@ -48,14 +48,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>
@@ -106,11 +106,11 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">上传图片并确认</a>
+          <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
           <a-dropdown>
-            <!-- <a class="ant-dropdown-link">确定 <a-icon type="down" /></a> -->
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a @click="handleDetail(record)">详情</a>
@@ -132,13 +132,13 @@
 </template>
 
 <script>
-
-  import '@/assets/less/TableExpand.less'
+  import { httpAction, getAction } from '@/api/manage'
+  import '@assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ItdmGongdanShujuModal from './modules/ItdmGongdanShujuModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
+  import {filterMultiDictText} from '@comp/dict/JDictSelectUtil'
+  
   export default {
     name: 'ItdmGongdanShujuList',
     mixins:[JeecgListMixin, mixinDevice],
@@ -147,6 +147,13 @@
     },
     data () {
       return {
+        // queryParam:{
+        //   woId:"1660195756643786754",
+        //   shiyanType:"0,1",
+        //   shiyanKaishitime:"00:00",
+        //   shiyanJieshutime:"23:59",
+        //   pinci:"90"
+        // },
         description: '工单数据管理页面',
         // 表头
         columns: [
@@ -222,11 +229,12 @@
         ],
         url: {
           list: "/itdmgomgongdanshuju/ItdmGongdanshuju/list",
-          delete: "/itdmgongdanshuju/itdmGongdanShuju/delete",
-          deleteBatch: "/itdmgongdanshuju/itdmGongdanShuju/deleteBatch",
+          delete: "/itdmgomgongdanshuju/ItdmGongdanShuju/delete",
+          deleteBatch: "/itdmgomgongdanshuju/ItdmGongdanshuju/deleteBatch",
           exportXlsUrl: "/itdmgongdanshuju/itdmGongdanShuju/exportXls",
           importExcelUrl: "itdmgongdanshuju/itdmGongdanShuju/importExcel",
-          
+          add: "/itdmgomgongdanshuju/ItdmGongdanshuju/add",
+      
         },
         dictOptions:{},
         superFieldList:[],
@@ -256,6 +264,18 @@
         fieldList.push({type:'Text',value:'extraPic',text:'试验图片',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList
+      },
+      create(){
+        httpAction("/itdmgomgongdanshuju/ItdmGongdanshuju/create",this.queryParam,"post").then((res)=>{
+          if(res.success){
+            that.$message.success(res.message);
+            that.$emit('ok');
+          }else{
+            that.$message.warning(res.message);
+          }
+           this.searchReset();
+        })
+       
       }
     }
   }

+ 40 - 30
itdmWeb/src/views/module-iTDM/gongdanshuju/modules/ItdmGongdanShujuForm.vue

@@ -5,54 +5,52 @@
         <a-row>
           <!-- <a-col :span="24">
             <a-form-model-item label="工单id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="woId">
-              <a-input v-model="model.woId" placeholder="请输入工单id"  ></a-input>
+              <j-popup
+                v-model="model.woId"
+                field="woId"
+                org-fields="shiyan_type,shiyan_data"
+                dest-fields="shiyanType,shiyanData"
+                code="itdm_gongdan_master"
+                :multi="true"
+                @input="popupCallback"
+                />
             </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
+          </a-col> -->
+          <!-- <a-col :span="24">
             <a-form-model-item label="试验类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanType">
-              <j-multi-select-tag type="list_multi" v-model="model.shiyanType" dictCode="shiiyan_type" placeholder="请选择试验类型" />
+              <j-dict-select-tag type="list" v-model="model.shiyanType" dictCode="shiyan_type" placeholder="请选择试验类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="试验开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanKaishitime">
-              <j-time placeholder="请选择试验开始时间"  v-model="model.shiyanKaishitime" style="width: 100%" />
+            <a-form-model-item label="试验时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanTime">
+              <j-date placeholder="请选择试验时间" v-model="model.shiyanTime"  style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="试验结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanJieshutime">
-              <j-time placeholder="请选择试验结束时间"  v-model="model.shiyanJieshutime" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="频次" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pinci">
-              <a-input v-model="model.pinci" placeholder="请输入频次"  ></a-input>
+            <a-form-model-item label="试验数据" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanData">
+              <a-input v-model="model.shiyanData" placeholder="请输入试验数据"  ></a-input>
             </a-form-model-item>
           </a-col> -->
-          <a-col :span="24">
-            <a-form-model-item label="生成的时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanTime">
-              <a-input v-model="model.shiyanTime" placeholder="请输入生成的时间"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
+             <a-col :span="24">
             <a-form-model-item label="试验数据温度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanWendu">
-              <a-input v-model="model.shiyanWendu" placeholder="请输入试验数据温度"  ></a-input>
+              <a-input v-model="model.shiyanWendu" placeholder="请输入试验数据"  ></a-input>
             </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="试验数据湿度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanShidu">
-              <a-input v-model="model.shiyanShidu" placeholder="请输入试验数据湿度"  ></a-input>
+          </a-col> 
+             <a-col :span="24">
+            <a-form-model-item label="试验数据湿度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanWendu">
+              <a-input v-model="model.shiyanShidu" placeholder="请输入试验数据"  ></a-input>
             </a-form-model-item>
-          </a-col>
+          </a-col> 
           <a-col :span="24">
             <a-form-model-item label="试验图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="extraPic">
               <j-image-upload isMultiple  v-model="model.extraPic" ></j-image-upload>
             </a-form-model-item>
           </a-col>
-          <!-- <a-col :span="24">
+          <a-col :span="24">
             <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
               <a-textarea v-model="model.remark" rows="4" placeholder="请输入备注" />
             </a-form-model-item>
-          </a-col> -->
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -93,11 +91,20 @@
            woId: [
               { required: true, message: '请输入工单id!'},
            ],
+           shiyanType: [
+              { required: true, message: '请输入试验类型!'},
+           ],
+           shiyanTime: [
+              { required: true, message: '请输入试验时间!'},
+           ],
+           shiyanData: [
+              { required: true, message: '请输入试验数据!'},
+           ],
         },
         url: {
-          add: "/itdmgongdanshuju/itdmGongdanShuju/add",
-          edit: "/itdmgongdanshuju/itdmGongdanShuju/edit",
-          queryById: "/itdmgongdanshuju/itdmGongdanShuju/queryById"
+          add: "/itdmgomgongdanshuju/ItdmGongdanshuju/add",
+          edit: "/itdmgomgongdanshuju/ItdmGongdanshuju/edit",
+          queryById: "/itdmgomgongdanshuju/ItdmGongdanShuju/queryById"
         }
       }
     },
@@ -147,6 +154,9 @@
          
         })
       },
+      popupCallback(value,row){
+         this.model = Object.assign(this.model, row);
+      },
     }
   }
 </script>

+ 6 - 8
itdmWeb/src/views/module-iTDM/weituochaxun/ItdmWeituoYangpinList.vue

@@ -1,17 +1,16 @@
 <template>
   <a-card :bordered="false">
- <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
+<div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <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.weituoClient"></a-input>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <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 label="委托单id">
+              <a-input placeholder="请输入委托id" v-model="queryParam.weituoId"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -28,10 +27,9 @@
       </a-form>
     </div>
     <!-- 查询区域-END -->
-
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!-- <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>

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

@@ -159,11 +159,11 @@ export default {
           align:"center",
           dataIndex: 'weituoLxr'
         },
-        {
-          title:'委托电话',
-          align:"center",
-          dataIndex: 'weituoPhone'
-        },
+        // {
+        //   title:'委托电话',
+        //   align:"center",
+        //   dataIndex: 'weituoPhone'
+        // },
             {
             title:'委托编号',
             align:"center",
@@ -196,11 +196,11 @@ export default {
           align:"center",
           dataIndex: 'shenheTime'
         },
-        //    {
-        //   title:'审核错误原因',
-        //   align:"center",
-        //   dataIndex: 'shenheMsg'
-        // },
+           {
+          title:'审核拒绝原因',
+          align:"center",
+          dataIndex: 'shenheMsg'
+        },
         {
           title:'审核状态',
           align:"center",