lims 检测计划

src/dashoo.cn/backend/api/business/limscheckequipmentlist/limscheckequipmentlist.go

@@ -0,0 +1,27 @@
+package limscheckequipmentlist
+
+import (
+	"time"
+)
+
+type LimsCheckEquipmentList struct {
+	Id              int       `json:"Id" xorm:"not null pk autoincr INT(10) 'Id'"`
+	DepartmentId    int       `json:"DepartmentId" xorm:"comment('二级单位ID') INT(10) 'DepartmentId'"`
+	OrderNo         int       `json:"OrderNo" xorm:"comment('序号') INT(10) 'OrderNo'"`
+	PositionCheckId int       `json:"PositionCheckId" xorm:"comment('检测地点ID') INT(11) 'PositionCheckId'"`
+	PositionCheck   string    `json:"PositionCheck" xorm:"comment('检测地点') VARCHAR(255) 'PositionCheck'"`
+	PositionID      int       `json:"PositionID" xorm:"comment('安装位置ID') INT(11) 'PositionID'"`
+	Position        string    `json:"Position" xorm:"comment('安装位置') VARCHAR(255) 'Position'"`
+	CustNo          string    `json:"CustNo" xorm:"comment('编号') VARCHAR(255) 'CustNo'"`
+	Spec            string    `json:"Spec" xorm:"comment('规格型号') VARCHAR(255) 'Spec'"`
+	SpecId          string    `json:"SpecId" xorm:"comment('规格型号Id') VARCHAR(255) 'SpecId'"`
+	Manufacturer    string    `json:"Manufacturer" xorm:"comment('制造厂家') VARCHAR(255) 'Manufacturer'"`
+	Status          string    `json:"Status" xorm:"comment('产品状态') VARCHAR(255) 'Status'"`
+	Remark          string    `xorm:VARCHAR(255)`       //描述
+	CreateOn        time.Time `xorm:"DATETIME created"` //创建时间
+	CreateUserId    int       `xorm:"INT(10)"`
+	CreateBy        string    `xorm:"VARCHAR(50)"` //创建人
+	ModifiedOn      time.Time `xorm:"DATETIME updated"`
+	ModifiedUserId  int       `xorm:"INT(10)"`
+	ModifiedBy      string    `xorm:"VARCHAR(50)"`
+}

src/dashoo.cn/backend/api/business/limscheckequipmentlist/limscheckequipmentlistService.go

@@ -0,0 +1,16 @@
+package limscheckequipmentlist
+
+import (
+	. "dashoo.cn/backend/api/mydb"
+	"github.com/go-xorm/xorm"
+)
+
+type LimsCheckEquipmentListService struct {
+	MyServiceBase
+}
+
+func GetLimsCheckEquipmentListService(xormEngine *xorm.Engine) *LimsCheckEquipmentListService {
+	s := new(LimsCheckEquipmentListService)
+	s.DBE = xormEngine
+	return s
+}

src/dashoo.cn/backend/api/controllers/base.go

@@ -257,6 +257,7 @@ var (
 	LimsPetroleUmPipeName                    string = "LimsReportPetroleumPipe"        //  石油专用管材方钻杆检验记录
 	LimsCertificateName                      string = "LimsCertificate"                //  关联证书表
 	LimsReportOilPipeUltrasonicName          string = "LimsReportOilPipeUltrasonic"    // 石油专用管材油（套）管超声波检测记录
+	LimsCheckEquipmentListName               string = "LimsCheckEquipmentList"         // 石油专用管材油（套）管超声波检测记录
 )
 
 //分页信息及数据

src/dashoo.cn/backend/api/controllers/lims/limscheckequipmentlist.go

@@ -0,0 +1,304 @@
+package lims
+
+import (
+	"encoding/json"
+	//"strings"
+	"time"
+
+	"dashoo.cn/backend/api/business/baseUser"
+	//"dashoo.cn/backend/api/business/items"
+	"dashoo.cn/backend/api/business/limscheckequipmentlist"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business/userRole"
+	"dashoo.cn/utils"
+)
+
+type LimsCheckEquipmentListController struct {
+	BaseController
+}
+
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []limscheckequipmentlist.LimsCheckEquipmentList
+// @router /list [get]
+func (this *LimsCheckEquipmentListController) GetEntityList() {
+
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	where := " 1=1 "
+	orderby := "Id"
+	asc := false
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		}
+	}
+	Id := this.GetString("Id")
+	DepartmentId := this.GetString("DepartmentId")
+	OrderNo := this.GetString("OrderNo")
+	PositionCheckId := this.GetString("PositionCheckId")
+	PositionCheck := this.GetString("PositionCheck")
+	PositionID := this.GetString("PositionID")
+	Position := this.GetString("Position")
+	CustNo := this.GetString("CustNo")
+	Spec := this.GetString("Spec")
+	SpecId := this.GetString("SpecId")
+	Manufacturer := this.GetString("Manufacturer")
+	Status := this.GetString("Status")
+
+	if Id != "" {
+		where = where + " and Id like '%" + Id + "%'"
+	}
+
+	if DepartmentId != "" {
+		where = where + " and DepartmentId like '%" + DepartmentId + "%'"
+	}
+
+	if OrderNo != "" {
+		where = where + " and OrderNo like '%" + OrderNo + "%'"
+	}
+
+	if PositionCheckId != "" {
+		where = where + " and PositionCheckId like '%" + PositionCheckId + "%'"
+	}
+
+	if PositionCheck != "" {
+		where = where + " and PositionCheck like '%" + PositionCheck + "%'"
+	}
+
+	if PositionID != "" {
+		where = where + " and PositionID like '%" + PositionID + "%'"
+	}
+
+	if Position != "" {
+		where = where + " and Position like '%" + Position + "%'"
+	}
+
+	if CustNo != "" {
+		where = where + " and CustNo like '%" + CustNo + "%'"
+	}
+
+	if Spec != "" {
+		where = where + " and Spec like '%" + Spec + "%'"
+	}
+
+	if SpecId != "" {
+		where = where + " and SpecId like '%" + SpecId + "%'"
+	}
+
+	if Manufacturer != "" {
+		where = where + " and Manufacturer like '%" + Manufacturer + "%'"
+	}
+
+	if Status != "" {
+		where = where + " and Status like '%" + Status + "%'"
+	}
+
+	/** if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+		}
+	} */
+
+	svc := limscheckequipmentlist.GetLimsCheckEquipmentListService(utils.DBE)
+	var list []limscheckequipmentlist.LimsCheckEquipmentList
+	total := svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取字典列表
+// @Description get user by token
+// @Success 200 {object} map[string]interface{}
+// @router /dictlist [get]
+func (this *LimsCheckEquipmentListController) GetDictList() {
+	dictList := make(map[string]interface{})
+	//dictSvc := items.GetItemsService(utils.DBE)
+	userSvc := baseUser.GetBaseUserService(utils.DBE)
+	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
+	//dictList["WellNo"] = dictSvc.GetKeyValueItems("WellNo", this.User.AccCode)
+	var userEntity userRole.Base_User
+	userSvc.GetEntityById(this.User.Id, &userEntity)
+	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
+
+	//var dictCustomer []svccustomer.Customer
+	//customerSvc.GetEntitysByWhere(this.User.AccCode + CustomerName, "", &dictCustomer)
+	//dictList["EntrustCorp"] = &dictCustomer
+
+	var datainfo DataInfo
+	datainfo.Items = dictList
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} limscheckequipmentlist.LimsCheckEquipmentList
+// @router /get/:id [get]
+func (this *LimsCheckEquipmentListController) GetEntity() {
+	Id := this.Ctx.Input.Param(":id")
+
+	var model limscheckequipmentlist.LimsCheckEquipmentList
+	svc := limscheckequipmentlist.GetLimsCheckEquipmentListService(utils.DBE)
+	svc.GetEntityByIdBytbl(this.User.AccCode+LimsCheckEquipmentListName, Id, &model)
+
+	this.Data["json"] = &model
+	this.ServeJSON()
+}
+
+// @Title 添加
+// @Description 新增
+// @Param 	body body limscheckequipmentlist.LimsCheckEquipmentList
+// @Success	200	{object} controllers.Request
+// @router /add [post]
+func (this *LimsCheckEquipmentListController) AddEntity() {
+	var model limscheckequipmentlist.LimsCheckEquipmentList
+	var jsonBlob = this.Ctx.Input.RequestBody
+	svc := limscheckequipmentlist.GetLimsCheckEquipmentListService(utils.DBE)
+
+	json.Unmarshal(jsonBlob, &model)
+	model.CreateOn = time.Now()
+	model.CreateBy = this.User.Realname
+	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	model.DepartmentId, _ = utils.StrTo(this.User.DepartmentId).Int()
+
+	_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsCheckEquipmentListName, &model)
+
+	var errinfo ErrorDataInfo
+	if err == nil {
+		//新增
+		errinfo.Message = "添加成功！"
+		errinfo.Code = 0
+		errinfo.Item = model.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 修改实体
+// @Description 修改实体
+// @Param 	body body limscheckequipmentlist.LimsCheckEquipmentList
+// @Success	200	{object} controllers.Request
+// @router /update/:id [post]
+func (this *LimsCheckEquipmentListController) UpdateEntity() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model limscheckequipmentlist.LimsCheckEquipmentList
+	svc := limscheckequipmentlist.GetLimsCheckEquipmentListService(utils.DBE)
+
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	model.ModifiedOn = time.Now()
+	model.ModifiedBy = this.User.Realname
+	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	cols := []string{
+
+		"Id",
+
+		"DepartmentId",
+
+		"OrderNo",
+
+		"PositionCheckId",
+
+		"PositionCheck",
+
+		"PositionID",
+
+		"Position",
+
+		"CustNo",
+
+		"Spec",
+
+		"SpecId",
+
+		"Manufacturer",
+
+		"Status",
+
+		"Remark",
+
+		"CreateOn",
+
+		"CreateUserId",
+
+		"CreateBy",
+
+		"ModifiedOn",
+
+		"ModifiedUserId",
+
+		"ModifiedBy",
+	}
+	err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCheckEquipmentListName, id, &model, cols)
+	if err == nil {
+		errinfo.Message = "修改成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "修改失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 删除单条信息
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /delete/:Id [delete]
+func (this *LimsCheckEquipmentListController) DeleteEntity() {
+	Id := this.Ctx.Input.Param(":Id")
+	var errinfo ErrorInfo
+	if Id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	var model limscheckequipmentlist.LimsCheckEquipmentList
+	var entityempty limscheckequipmentlist.LimsCheckEquipmentList
+	svc := limscheckequipmentlist.GetLimsCheckEquipmentListService(utils.DBE)
+	opdesc := "删除-" + Id
+	err := svc.DeleteOperationAndWriteLogBytbl(this.User.AccCode+LimsCheckEquipmentListName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "钻井日报")
+	if err == nil {
+		errinfo.Message = "删除成功"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}

src/dashoo.cn/backend/api/routers/router.go

@@ -563,6 +563,12 @@ func init() {
 				&limswzjys.LimsReportOilPipeUltrasonicController{},
 			),
 		),
+		// 二级单位设备台账
+		beego.NSNamespace("/limscheckequipmentlist",
+			beego.NSInclude(
+				&lims.LimsCheckEquipmentListController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -161,20 +161,20 @@ module.exports = {
     // baseURL: '//47.92.212.59:10091/api/'
 	  baseURL: '//localhost:10091/api/'
   },
-  /*ignore: [
-    'pages/lims/report*!/!*.*',
-    'pages/lims/createreport/!*.*',
-    'pages/lims/dataentry/!*.*',
-    'pages/lims/deliver/!*.*',
-    'pages/lims/drillingdaily/!*.*',
-    'pages/lims/oiltestingdaily/!*.*',
-    'pages/lims/preparation/!*.*',
-    'pages/lims/tasksbalance/!*.*',
-    'pages/lims/tasksentrust/!*.*',
-    'pages/system/!*.*',
-    'pages/setting/!*.*',
+  ignore: [
+    'pages/lims/report*/*.*',
+    'pages/lims/createreport/*.*',
+    'pages/lims/dataentry/*.*',
+    'pages/lims/deliver/*.*',
+    'pages/lims/drillingdaily/*.*',
+    'pages/lims/oiltestingdaily/*.*',
+    'pages/lims/preparation/*.*',
+    'pages/lims/tasksbalance/*.*',
+    'pages/lims/tasksentrust/*.*',
+    'pages/system/*.*',
+    'pages/setting/*.*',
     'pages/prototype/!*.*',
-    'pages/material/!*.*',
-    'pages/report/!*.*',
-  ]*/
+    'pages/material/*.*',
+    'pages/report/*.*',
+  ]
 }

src/dashoo.cn/frontend_web/src/api/lims/limscheckequipmentlist.js

@@ -0,0 +1,41 @@
+export default {
+  getList(CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/limscheckequipmentlist/list?CreateOn='+ CreateOn,
+      method: 'GET',
+      params: params
+    });
+  },
+  getDictList(myAxios) {
+    return myAxios({
+      url: '/limscheckequipmentlist/dictlist/',
+      method: 'GET'
+    });
+  },
+  getEntity(entityId, myAxios) {
+    return myAxios({
+      url: '/limscheckequipmentlist/get/'+entityId,
+      method: 'GET',
+    })
+  },
+  addEntity(formData, myAxios) {
+    return myAxios({
+      url: '/limscheckequipmentlist/add',
+      method: 'post',
+      data: formData
+    })
+  },
+  updateEntity(entityId, formData, myAxios) {
+    return myAxios({
+      url: '/limscheckequipmentlist/update/'+entityId,
+      method: 'post',
+      data: formData
+    })
+  },
+  deleteEntity(entityId, myAxios) {
+    return myAxios({
+      url: '/limscheckequipmentlist/delete/'+entityId,
+      method: 'delete'
+    })
+  },
+}

src/dashoo.cn/frontend_web/src/pages/lims/checkequipmentlist/index.vue

@@ -0,0 +1,437 @@
+
+
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/lims/s5ovelimscheckequipmentlist' }">二级单位设备台账表</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 二级单位设备台账表
+        </span>
+        <span style="float: right;">
+          <router-link :to="'/lims/s5ovelimscheckequipmentlist/add/operation'">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
+          </router-link>
+        </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="上报时间">
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+        <el-table-column label="操作" min-width="100" align="center" fixed>
+          <template slot-scope="scope">
+            <router-link :to="'/lims/s5ovelimscheckequipmentlist/' + scope.row.Id + '/operation'">
+              <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
+            </router-link>
+
+            <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
+              <el-alert
+                title=""
+                description="确认要删除吗？"
+                type="warning"
+                :closable="false">
+              </el-alert>
+              <br/>
+              <div style="text-align: right; margin: 0">
+                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+              </div>
+              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
+                <i class="el-icon-delete"></i>
+              </el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+
+        <el-table-column v-for="column in tableColumns" :key="column.Id"
+                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
+
+        <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.CreateOn+'') }}
+          </template>
+        </el-table-column>-->
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+      </el-pagination>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="110px">
+        <el-row>
+
+          <el-col :span="12">
+            <el-form-item label="生成时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="二级单位ID">
+              <el-input size="mini" v-model="searchForm.DepartmentId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="序号">
+              <el-input size="mini" v-model="searchForm.OrderNo" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="检测地点ID">
+              <el-input size="mini" v-model="searchForm.PositionCheckId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="检测地点">
+              <el-input size="mini" v-model="searchForm.PositionCheck" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="安装位置ID">
+              <el-input size="mini" v-model="searchForm.PositionID" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="安装位置">
+              <el-input size="mini" v-model="searchForm.Position" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="编号">
+              <el-input size="mini" v-model="searchForm.CustNo" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="规格型号">
+              <el-input size="mini" v-model="searchForm.Spec" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="规格型号Id">
+              <el-input size="mini" v-model="searchForm.SpecId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="制造厂家">
+              <el-input size="mini" v-model="searchForm.Manufacturer" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="产品状态">
+              <el-input size="mini" v-model="searchForm.Status" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+  import { mapGetters } from 'vuex';
+  import api from '@/api/lims/limscheckequipmentlist';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 's5ovelimscheckequipmentlist',
+
+    data() {
+      return {
+        dialogVisible: false,
+        //列表数据
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        searchForm: {
+          Id: '',
+          DepartmentId: '',
+          OrderNo: '',
+          PositionCheckId: '',
+          PositionCheck: '',
+          PositionID: '',
+          Position: '',
+          CustNo: '',
+          Spec: '',
+          SpecId: '',
+          Manufacturer: '',
+          Status: '',
+
+        },
+        tableColumns: [
+
+          {
+            prop: "Id",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "DepartmentId",
+            label: '二级单位ID',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "OrderNo",
+            label: '序号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "PositionCheckId",
+            label: '检测地点ID',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "PositionCheck",
+            label: '检测地点',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "PositionID",
+            label: '安装位置ID',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Position",
+            label: '安装位置',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "CustNo",
+            label: '编号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Spec",
+            label: '规格型号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SpecId",
+            label: '规格型号Id',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Manufacturer",
+            label: '制造厂家',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Status",
+            label: '产品状态',
+            width: 100,
+            sort: true
+          },
+
+        ]
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm);
+      //查询列表
+      this.initDatas();
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        //访问接口
+        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        row.deleteConfirmFlag = false;
+        api.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

src/dashoo.cn/frontend_web/src/pages/lims/principal/subdata/customerposition.vue

@@ -245,7 +245,7 @@
           },
 
           {
-            prop: "PositionTypeId",
+            prop: "PositionType",
             label: '位置类型',
             width: 100,
             sort: true

src/dashoo.cn/frontend_web/src/pages/lims/secondunitform/index.vue

@@ -67,34 +67,37 @@
         </el-tab-pane>
 
         <el-tab-pane label="设备列表" name="2">
-          <el-table
-            :data="tableData2"
-            stripe
-            style="width: 100%">
-            <el-table-column
-              prop="seqNo"
-              label="序号"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              label="设备分类"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="address"
-              label="地点名称"
-              width="180">
-            </el-table-column>
-            <el-table-column
-              prop="address2"
-              label="设备厂家">
-            </el-table-column>
-            <el-table-column
-              prop="address3"
-              label="设备型号">
-            </el-table-column>
-          </el-table>
+          <div>
+            <el-button type="primary" size="mini">新增设备</el-button>
+            <el-table
+              :data="tableData2"
+              stripe
+              style="width: 100%">
+              <el-table-column
+                prop="seqNo"
+                label="序号"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                label="设备分类"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="address"
+                label="地点名称"
+                width="180">
+              </el-table-column>
+              <el-table-column
+                prop="address2"
+                label="设备厂家">
+              </el-table-column>
+              <el-table-column
+                prop="address3"
+                label="设备型号">
+              </el-table-column>
+            </el-table>
+          </div>
         </el-tab-pane>
       </el-tabs>
 

src/dashoo.cn/frontend_web/src/pages/lims/taskplan/_opera/operation.vue

@@ -0,0 +1,1462 @@
+<style>
+  .input-with-select .el-select .el-input {
+    width: 110px;
+  }
+  .input-with-select .el-input-group__append {
+    background-color: #fff;
+  }
+</style>
+
+<template>
+  <div>
+    <el-card style="min-height: calc(100vh - 189px)">
+      <div slot="header" style="height: 20px;">
+        <span style="float: left;">
+          <i class="icon icon-table2"></i>
+        </span>
+        <el-breadcrumb class="heading" style="float: left; margin-left: 5px">
+          <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+          <el-breadcrumb-item :to="{ path: '/lims/taskplan' }">检测计划</el-breadcrumb-item>
+          <el-breadcrumb-item>{{pagetitle}}</el-breadcrumb-item>
+        </el-breadcrumb>
+
+        <span style="float: right;">
+
+          <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px" v-if="mainForm.EntrustStatus == 0"
+                     @click="trueEntrustNo">保存</el-button>
+          <router-link :to="'/lims/taskplan'">
+            <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px">返回</el-button>
+          </router-link>
+        </span>
+      </div>
+      <el-form :model="mainForm" :rules="rulesmainForm" label-width="130px" ref="mainForm">
+        <el-row :gutter="10" class="entrustformcss">
+          <el-col :span="8">
+            <el-form-item label="检测报告" prop="ProjectTypeId">
+              <el-select ref="refProjectTypeId" v-model="mainForm.ProjectTypeId" @change="SampleTypeChangeHandler"
+                         style="width:100%" filterable placeholder="请选择">
+                <el-option v-for="item in projectTypeList" :key="item.id" :label="item.FullName" :value="item.Id"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="(!tjz)?'委托单号':'报告单号'" prop="EntrustNo">
+              <el-input v-model="mainForm.EntrustNo" placeholder="单号" :disabled="mainForm.EntrustNo == ''"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托类型" prop="EntrustTypeId">
+              <el-select ref="refEntrustType" v-model="mainForm.EntrustTypeId" style="width:100%" placeholder="请选择委托类型">
+                <el-option v-for="item in entypeList" :key="item.Id" :label="item.Value" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="委托方名称">
+              <el-input v-model="mainForm.CustomerName" placeholder="委托方名称" readonly></el-input>
+              <!--<el-select ref="selectCustomer" disabled v-model="mainForm.CustomerId" filterable placeholder="请选择" style="width: 100%"
+                         @change="chooseCustomer">
+                <el-option-group v-for="group in groupOptions" :key="group.label" :label="group.label">
+                  <el-option v-for="item in group.options" :key="item.Id" :label="item.CustomerName" :value="item.Id">
+                  </el-option>
+                </el-option-group>
+              </el-select>-->
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="16">
+            <el-form-item label="委托方地址">
+              <el-input v-model="mainForm.Address" placeholder="委托方地址" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="!tjz">
+            <el-form-item label="检测地点" required>
+              <el-select ref="refAddress" v-model="mainForm.AddressId" style="width:100%" placeholder="请选择检测地点">
+                <el-option v-for="item in addressList" :key="item.Id" :label="item.PositionName" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="机构代码">
+              <el-input v-model="mainForm.CustomerCode" placeholder="请输入委托方机构代码" disabled></el-input>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="经办人">
+              <el-input v-model="mainForm.CustomerPerson" placeholder="委托方经办人"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系电话">
+              <el-input v-model="mainForm.CustomerTelephone" placeholder="委托方联系电话"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="tjz">
+          </el-col>
+
+          <!-- 暂时隐藏
+          <el-col :span="8">
+            <el-form-item label="样品名称">
+              <el-cascader :options="sampleTypeTreeList" :props="orgtreeprops" :show-all-levels="false" v-model="selectedorg"
+                placeholder="请选择样品名称" style="width: 100%"></el-cascader>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="数量/单位" prop="SampleNum">
+              <el-input type="SampleNum" placeholder="数量" v-model.number="mainForm.SampleNum" class="input-with-select">
+                <el-select ref="reftube" v-model="mainForm.Unit" slot="append" placeholder="单位">
+                  <el-option v-for="item in sampeunitlist" :label="item.Value" :value="item.Value" :key="item.Value">
+                  </el-option>
+                </el-select>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托时间" prop="EntrustTime">
+              <el-date-picker style="width: 100%" v-model="mainForm.EntrustTime" type="datetime" placeholder="请选择委托日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="截止日期" prop="EndTime">
+              <el-date-picker style="width: 100%" v-model="mainForm.EndTime" type="datetime" placeholder="请选择截止日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8" v-if="ServiceId != 'addentrust'">
+            <el-form-item label="委托状态">
+              <el-select v-model="mainForm.EntrustStatus" style="width:100%" placeholder="请选择委托状态">
+                <el-option label="待审核" value="0"></el-option>
+                <el-option label="已审核" value="1"></el-option>
+                <el-option label="审核未通过" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="24">
+            <el-form-item label="委托描述">
+              <el-input v-model="mainForm.Remarks" type="textarea" :rows=3 placeholder="请输入委托描述"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="mainForm.EntrustStatus == 1">
+            <el-form-item label="检测样本数量">
+              <span>{{ TestSampleNum }}</span>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24" v-if="mainForm.EntrustStatus != 0">
+            <el-form-item label="审核说明">
+              <el-input v-model="mainForm.AuditorRemark" type="textarea" :rows=3 placeholder="请输入审核说明"></el-input>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+
+      </el-form>
+
+      <el-table
+        :data="tableData2"
+        stripe
+        style="width: 100%">
+        <el-table-column
+          prop="seqNo"
+          label="序号"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="设备分类"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="地点名称"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="address2"
+          label="设备厂家">
+        </el-table-column>
+        <el-table-column
+          prop="address3"
+          label="设备型号">
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import axios from "../../../../../.nuxt/axios";
+  import docTemplateApi from '@/api/lims/docTemplate';
+  import entrustApi from "@/api/lims/limsentrust";
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'limsentrustdetail',
+    data() {
+      return {
+        //ln
+        typevalue: [],
+        EntrustSampleId: '',
+        //ln
+        currentPage: 1,
+        size: 10,
+        currentItemCount: 0,
+        pagetitle: '', //界面标题
+        ServiceId: '',
+        Id: '',
+        //样本单位
+        sampeunitlist: [],
+        //委托方名称
+        customerList: [],
+        groupOptions: [{
+          label: '大港油田',
+          options: []
+        }, {
+          label: '外部委托方',
+          options: []
+        }],
+        addressList: [],
+        CusAddList: [],
+        projectTypeList: [], //检测报告大项
+        sampleTypeList: [], //检测项目小项,样品名称列表
+        sampleTypeTreeList: [],
+        selectedorg: [],
+        //详情
+        testdetails: [],
+        //检测类型
+        testtypes: [],
+
+        orgtreeprops: {
+          value: 'id',
+          label: 'FullName',
+          children: 'children'
+        },
+        sampleTypeOrigList: [],
+        testTypeList: [], //检测类型
+        entypeList: [], //委托类型
+        departmentList: [], //特检站下属部门
+        departmentId: '',
+        templatecode: '',
+        tjz: false,
+        entrustTotal: 0,
+        SampleTypeIdnow: '',
+        mainForm: {
+          Id: '',
+          SampleNum: 0.0,
+          EntrustNo: '',
+          CustomerId: '',
+          CustomerName: '',
+          CustomerPerson: '',
+          CustomerTelephone: '',
+          AddressId: '',
+          AddressName: '',
+          ProjectType: '',
+          ProjectTypeId: '',
+          EntrustStatus: 0,
+          AuditorRemark: '',
+          DeliverStatus: 0,
+          ReportStatus: 0,
+          EntrustTime: new Date(),
+          EndTime: new Date(),
+          DetectSample: '',
+          DetectSampleId: '',
+          Samplelist: '',
+          Remarks: '',
+          Person: '',
+          Telephone: '',
+          Address: '',
+          CustomerCode: '',
+          ParentId: '',
+          ISdeliver: 0,
+          ISprepare: 0,
+          PrepareNum: 0,
+          ISreveive: 0,
+          ReveiveNum: 0.0,
+          DataTemplateId: 0,
+          DataTemplateName: '',
+        },
+        TestSampleNum: 0,
+        rulesmainForm: {
+          EntrustNo: [{
+            required: true,
+            message: '请输入委托单号',
+            trigger: 'blur'
+          }],
+          EntrustTypeId: [{
+            required: true,
+            message: '请选择委托类型',
+            trigger: 'change'
+          }],
+          ProjectTypeId: [{
+            required: true,
+            message: '请选择检测报告',
+            trigger: 'change'
+          }],
+          CustomerId: [{
+            required: true,
+            message: '请选择委托方',
+            trigger: 'change'
+          }],
+          SampleNum: [{
+            type: 'number',
+            message: "样品数量必须为数值",
+            trigger: "blur",
+          }],
+        },
+        tableData2: [{
+          seqNo: '1',
+          name: '无游梁式抽油机检测',
+          address: '1号位',
+          address2: '大连制表厂',
+          address3: 'A001'
+        }, {
+          seqNo: '2',
+          name: '阻火器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'B002'
+        }, {
+          seqNo: '3',
+          name: '呼吸阀检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'C003'
+
+        }, {
+          seqNo: '4',
+          name: '空气泡沫产生器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'D004'
+        },{
+          seqNo: '5',
+          name: '无游梁式抽油机检测',
+          address: '1号位',
+          address2: '大连制表厂',
+          address3: 'A001'
+        }, {
+          seqNo: '6',
+          name: '阻火器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'B002'
+        }, {
+          seqNo: '7',
+          name: '呼吸阀检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'C003'
+
+        }, {
+          seqNo: '8',
+          name: '空气泡沫产生器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'D004'
+        }],
+        status_flag: false,
+        deliverShow: false,
+        deliverList: [],
+        deliverTitle: '',
+        deliver_flag: '',
+        sampleForm: {
+          Id: '',
+          EId: '',
+          EntrustNo: '',
+          SampleCode: '',
+          DetectSampleId: '',
+          DetectSample: '',
+          EntrustTypeId: '',
+          EntrustType: '',
+          SourceType: '',
+          DetectCharacter: '',
+          Unit: '',
+          SampleNum: 0.0,
+          Specification: '',
+          SampleLogo: '',
+          Environment: '',
+          OriginalCode: '',
+          CollectionBy: '',
+          CollectionDate: new Date(),
+          ISsend: 0,
+          ISexchange: 0,
+          ISprepare: 0,
+          PrepareNum: 0,
+          ISreveive: 0,
+          ReveiveNum: 10.,
+          Remark: ''
+        },
+        rulesdeliverForm: {
+          SampleNum: [{
+            type: 'number',
+            message: "样品数量必须为数值",
+            trigger: "blur",
+          }],
+          SampleCode: [{
+            required: true,
+            message: '请输入样品编号',
+            trigger: 'blur'
+          }],
+        },
+        detail_flag: true,
+        transportDialog: false,
+        detailsDialog: false,
+        deliverForm: {
+          Id: '',
+          EId: '',
+          EntrustNo: '',
+          DetectSampleId: '',
+          DetectSample: '',
+          EntrustTypeId: '',
+          EntrustType: '',
+          Unit: '',
+          SampleNum: 0.0,
+          DeliverNo: '',
+          Transport: '',
+          TransportNum: '',
+          Courier: '',
+          Sender: '',
+          Notes: '',
+          ISsend: 0,
+        },
+        rulesTransport: {
+          Sender: [{
+            required: true,
+            message: "请填写发件人",
+            trigger: "blur",
+          }],
+        },
+        //分配信息弹窗
+        balanceShow: false,
+        partuserlist: [],
+        balanceForm: {
+          ConUserId: '',
+          ConUserBy: '',
+          Remark: '',
+        },
+        OfficerList: [],
+        docTemplateDictList: [],
+        //审核信息弹窗
+        auditorShow: false,
+        shenheForm: {
+          SuccessStatus: 0,
+          AuditorRemark: ''
+        },
+        lightpermission: false,
+        permissionscode: {
+          add: 'lims.deliver.add',
+          edit: 'lims.entrust.edit',
+          balance: 'lims.balance.edit',
+        },
+        permissions: {
+          'lims.deliver.add': false,
+          'lims.entrust.edit': false,
+          'lims.balance.edit': false,
+        },
+      }
+    },
+    created() {
+      this.ServiceId = this.$route.params.opera
+      this.departmentId = this.authUser.Profile.DepartmentId
+
+      this.getCustomerInfo()
+      // request
+      if (this.ServiceId === 'add') {
+        this.pagetitle = '新增检测计划'
+        this.mainForm.EntrustTypeId = 329 //委托检测
+        // this.getEntrustNo()
+        // this.testcodec()
+      } else if (this.ServiceId != '0') {
+        this.pagetitle = '编辑检测计划'
+        this.getEntrustInfo()
+      }
+      //获取委托类型
+      this.getEntypeList()
+      this.getsamplesnumlist()
+      this.getCustomer()
+      this.getProjectType()
+      this.getSampleTypeOrigList()
+      this.getDictList()
+      //判断组织结构
+      this.getOrganizeListById()
+      this.getPermissions() //权限
+    },
+    methods: {
+      //验证单号是否唯一
+      trueEntrustNo() {
+        let _this = this
+        if (_this.ServiceId == 'addentrust') {
+          _this.$axios.get("/limsentrust/entrustmakesure?EntrustNo=" + _this.mainForm.EntrustNo, {})
+            .then(function (response) {
+              _this.entrustTotal = response.data.items
+              if (_this.entrustTotal === 0) {
+                _this.checkField()
+              } else {
+                _this.$message({
+                  type: 'warning',
+                  message: '单号重复！'
+                })
+              }
+            })
+        } else {
+          _this.checkField()
+        }
+      },
+      //检查字段是否为空
+      checkField() {
+        let _this = this
+        if (_this.selectedorg && _this.selectedorg.length > 0) { //验证样本
+          if (_this.mainForm.CustomerId && _this.mainForm.CustomerId > 0) { //验证委托方
+            if (!_this.tjz) {
+              if (_this.mainForm.AddressId && _this.mainForm.AddressId > 0) { //验证检测地点
+                _this.saveEntity()
+              } else {
+                _this.$message({
+                  type: 'warning',
+                  message: '请选择检测地点！'
+                })
+              }
+            } else {
+              _this.saveEntity()
+            }
+          } else {
+            _this.$message({
+              type: 'warning',
+              message: '请选择委托方！'
+            })
+          }
+        } else {
+          _this.$message({
+            type: 'warning',
+            message: '请选择样品名称！'
+          })
+        }
+      },
+      //保存数据
+      saveEntity() {
+        if (this.ServiceId == 'addentrust' || this.ServiceId <= '0') {
+          this.addEntrust()
+        } else {
+          this.editEntrust()
+        }
+      },
+
+      addEntrust() {
+        let _this = this
+        this.$refs['mainForm'].validate((valid) => {
+          if (valid) {
+            _this.mainForm.EntrustStatus = -1
+            _this.mainForm.SampleNum = parseFloat(_this.mainForm.SampleNum)
+            _this.mainForm.CustomerId = parseInt(_this.mainForm.CustomerId)
+            _this.mainForm.CustomerName = _this.$refs.selectCustomer.selectedLabel + ''
+            _this.mainForm.AddressId = parseInt(_this.mainForm.AddressId)
+            if (!_this.tjz && _this.mainForm.AddressId && _this.mainForm.AddressId != 0) {
+              _this.mainForm.AddressName = _this.$refs.refAddress.selectedLabel + ''
+            }
+            _this.mainForm.ProjectTypeId = parseInt(_this.mainForm.ProjectTypeId)
+            _this.mainForm.ProjectType = _this.$refs.refProjectTypeId.selectedLabel + ''
+            _this.mainForm.EntrustTypeId = parseInt(_this.mainForm.EntrustTypeId)
+            _this.mainForm.EntrustType = _this.$refs.refEntrustType.selectedLabel + ''
+            _this.mainForm.DetectSampleId = parseInt(_this.selectedorg[_this.selectedorg.length - 1])
+            _this.mainForm.DetectSample = _this.getDetectSampleName(_this.mainForm.DetectSampleId)
+            _this.mainForm.Samplelist = _this.selectedorg.join(',')
+            _this.$axios.post('/limsentrust/addentrust', _this.mainForm)
+              .then(res => {
+                // response
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  _this.ServiceId = res.data.item
+                  //刷新一下界面
+                  _this.getEntrustInfo()
+                  _this.getpartuserlist(this.mainForm.DataTemplateId)
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(err => {
+                // handle error
+                console.error(err)
+              })
+          } else {
+            return false
+          }
+        })
+      },
+      editEntrust() {
+        let _this = this
+        this.$refs['mainForm'].validate((valid) => {
+          if (valid) {
+            let _this = this
+            _this.mainForm.EntrustStatus = parseInt(_this.mainForm.EntrustStatus)
+            _this.mainForm.SampleNum = parseInt(_this.mainForm.SampleNum)
+            _this.mainForm.CustomerId = parseInt(_this.mainForm.CustomerId)
+            _this.mainForm.CustomerName = _this.$refs.selectCustomer.selectedLabel + ''
+            _this.mainForm.AddressId = parseInt(_this.mainForm.AddressId)
+            if (_this.mainForm.AddressId && _this.mainForm.AddressId != 0) {
+              _this.mainForm.AddressName = _this.$refs.refAddress.selectedLabel + ''
+            }
+            _this.mainForm.ProjectTypeId = parseInt(_this.mainForm.ProjectTypeId)
+            _this.mainForm.ProjectType = _this.$refs.refProjectTypeId.selectedLabel + ''
+            _this.mainForm.EntrustTypeId = parseInt(_this.mainForm.EntrustTypeId)
+            _this.mainForm.EntrustType = _this.$refs.refEntrustType.selectedLabel + ''
+            _this.mainForm.DetectSampleId = parseInt(_this.selectedorg[_this.selectedorg.length - 1])
+            _this.mainForm.DetectSample = _this.getDetectSampleName(_this.mainForm.DetectSampleId)
+            _this.mainForm.Samplelist = _this.selectedorg.join(',')
+            _this.$axios.put('limsentrust/editentrust/' + _this.ServiceId, _this.mainForm)
+              .then(res => {
+                // response
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  _this.getEntrustInfo()
+                  _this.getSampleList()
+                  _this.getpartuserlist(this.mainForm.DataTemplateId)
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              }).catch(err => {
+              console.error(err)
+            })
+          } else {
+            return false
+          }
+        })
+      },
+      getEntrustInfo() {
+        let _this = this
+        this.$axios.get('limsentrust/getentrustinfo/' + _this.ServiceId, {})
+          .then(res => {
+            _this.mainForm = res.data
+            _this.mainForm.EntrustStatus = _this.mainForm.EntrustStatus + ''
+            if (res.data.EntrustStatus == '1') {
+              _this.status_flag = true
+            }
+            _this.mainForm.SampleNum = parseInt(_this.mainForm.SampleNum + '')
+            _this.mainForm.EntrustTime = new Date(res.data.EntrustTime)
+            _this.mainForm.EndTime = new Date(res.data.EndTime)
+            // if (res.data.Samplelist) {
+            //   let dataIntArr = res.data.Samplelist.split(',')
+            //   dataIntArr = dataIntArr.map(function (data) {
+            //     return +data;
+            //   })
+            //   _this.selectedorg = dataIntArr
+            // } else {
+            //   _this.selectedorg = []
+            // }
+            _this.getAddress(_this.mainForm.CustomerId)
+            _this.getpartuserlist(this.mainForm.DataTemplateId)
+          }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
+      getSampleNum() {
+        let _this = this
+        this.$axios.get('limsentrust/getsamplenum/' + _this.ServiceId, {})
+          .then(res => {
+            _this.TestSampleNum = res.data
+          }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
+
+      saveDetail() {
+        let _this = this
+        //负责人姓名
+        let tempOfficers = [];
+        for (let idx in _this.OfficerList) {
+          let selectId = _this.OfficerList[idx];
+          for (let idx2 in _this.partuserlist) {
+            let item = _this.partuserlist[idx2];
+            if (item.Id == selectId) {
+              tempOfficers.push(item.Realname);
+              break;
+            }
+          }
+        }
+        _this.balanceForm.ConUserBy = tempOfficers.join(',');
+        _this.$axios.post('/limsentrust/taskbalance/' + _this.mainForm.Id + '?samplecode=' + _this.sampleForm.SampleCode,
+          _this.balanceForm)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              _this.$message({
+                type: 'success',
+                message: res.data.message
+              })
+              _this.balanceShow = false
+              _this.getEntrustInfo() //更新界面
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+
+      //保存委托样本明细信息
+      addSample() {
+        let _this = this
+        this.$refs['sampleForm'].validate((valid) => {
+          if (valid) {
+            let _this = this
+            _this.sampleForm.EId = parseInt(_this.ServiceId)
+            _this.sampleForm.EntrustNo = _this.mainForm.EntrustNo
+            _this.sampleForm.DetectSampleId = parseInt(_this.sampleForm.DetectSampleId)
+            _this.sampleForm.DetectSample = _this.getDetectSampleName(_this.sampleForm.DetectSampleId)
+            _this.sampleForm.EntrustTypeId = parseInt(_this.mainForm.EntrustTypeId)
+            _this.sampleForm.EntrustType = _this.$refs.refEntrustType.selectedLabel + ''
+            _this.sampleForm.Unit = _this.sampleForm.Unit
+            _this.sampleForm.SampleNum = parseFloat(_this.mainForm.SampleNum)
+            _this.sampleForm.ISsend = parseInt(_this.mainForm.ISsend)
+            _this.sampleForm.ISprepare = parseInt(_this.mainForm.ISprepare)
+            _this.sampleForm.PrepareNum = parseInt(_this.mainForm.PrepareNum)
+            _this.sampleForm.ISreveive = parseInt(_this.mainForm.ISreveive)
+            _this.sampleForm.ReveiveNum = parseFloat(_this.mainForm.ReveiveNum)
+            _this.$axios.post('limsentrustsample/entrustsampleadd/', _this.sampleForm)
+              .then(res => {
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  _this.deliverShow = false
+                  _this.getSampleList()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(err => {
+                console.error(err)
+              })
+          } else {
+            return false
+          }
+        })
+      },
+      showSample(val) {
+        let _this = this
+        _this.deliver_flag = 'showSample'
+        _this.deliverTitle = "样品交接详情"
+        _this.sampleForm.Id = val.Id
+        _this.sampleForm.SampleCode = val.SampleCode
+        _this.sampleForm.DetectSampleId = val.DetectSampleId
+        _this.sampleForm.DetectSample = val.DetectSample
+        _this.sampleForm.SourceType = val.SourceType
+        _this.sampleForm.DetectCharacter = val.DetectCharacter
+        _this.sampleForm.SampleNum = val.SampleNum
+        _this.sampleForm.Unit = val.Unit
+        _this.sampleForm.Specification = val.Specification
+        _this.sampleForm.SampleLogo = val.SampleLogo
+        _this.sampleForm.Environment = val.Environment
+        _this.sampleForm.OriginalCode = val.OriginalCode
+        _this.sampleForm.CollectionBy = val.CollectionBy
+        _this.sampleForm.CollectionDate = new Date(val.CollectionDate)
+        _this.sampleForm.ISprepare = _this.mainForm.ISprepare
+        _this.sampleForm.Remark = val.Remark
+        _this.deliverShow = true
+      },
+      editSample() {
+        let _this = this
+        this.$refs['sampleForm'].validate((valid) => {
+          if (valid) {
+            let _this = this
+            _this.sampleForm.SampleNum = parseFloat(_this.sampleForm.SampleNum)
+            _this.sampleForm.ISsend = parseInt(_this.mainForm.ISsend)
+            _this.sampleForm.ISprepare = parseInt(_this.sampleForm.ISprepare)
+            _this.sampleForm.PrepareNum = parseInt(_this.sampleForm.PrepareNum)
+            _this.sampleForm.ISreveive = parseInt(_this.sampleForm.ISreveive)
+            _this.sampleForm.ReveiveNum = parseFloat(_this.sampleForm.ReveiveNum)
+            _this.$axios.put('limsentrustsample/editentrustsample/' + _this.sampleForm.Id, _this.sampleForm)
+              .then(res => {
+                // response
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  _this.deliverShow = false
+                  _this.getSampleList()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              }).catch(err => {
+              console.error(err)
+            })
+          } else {
+            return false
+          }
+        })
+      },
+      deleteSample(val) {
+        let _this = this;
+        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            _this.$axios
+              .delete("limsentrustsample/entrustsampledelete/" + val.Id, {})
+              .then(function (response) {
+                // response
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: "success",
+                    message: response.data.message
+                  });
+                  // 更新界面
+                  _this.getEntrustInfo()
+                  //刷新样品明显列表
+                  _this.getSampleList()
+                } else {
+                  _this.$message({
+                    type: "warning",
+                    message: response.data.message
+                  });
+                }
+              })
+              .catch(function (error) {
+                console.log(error);
+              });
+          })
+          .catch(() => {});
+      },
+      sampleDialog() {
+        this.deliverShow = true
+        this.deliverTitle = '新增样品信息'
+        this.deliver_flag = 'adddeliver'
+        this.sampleForm.Id = ''
+        this.sampleForm.DetectSampleId = ''
+        this.sampleForm.DetectSample = ''
+        this.sampleForm.SourceType = ''
+        this.sampleForm.DetectCharacter = ''
+        this.sampleForm.SampleNum = this.mainForm.SampleNum
+        this.sampleForm.Unit = this.mainForm.Unit
+        this.sampleForm.Specification = ''
+        this.sampleForm.SampleLogo = ''
+        this.sampleForm.Environment = ''
+        this.sampleForm.OriginalCode = ''
+        this.sampleForm.CollectionBy = ''
+        this.sampleForm.CollectionDate = new Date()
+        this.sampleForm.Notes = ''
+        this.testcodec()
+      },
+      getSampleList() {
+        let _this = this
+        // request
+        this.$axios.get("/limsentrustsample/getentrustsamplelist/" + _this.ServiceId, {})
+          .then(res => {
+            _this.deliverList = res.data.items
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+
+      //ln
+      deletetesttype(val) {
+        let _this = this;
+        this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            _this.$axios
+              .delete('/limsentrustsample/deletetesttype/' + val.Id)
+              .then(function (response) {
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: response.data.message
+                  })
+                  _this.details1(_this.EntrustSampleId)
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: response.data.message
+                  })
+                }
+              })
+              .catch(function (error) {
+                console.log(error)
+              })
+          })
+          .catch(() => {})
+      },
+      addTestType() {
+        this.$axios.post('/limsentrustsample/addtesttype/' + this.EntrustSampleId, this.typevalue)
+          .then(response => {
+            if (response.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: response.data.message
+              })
+              this.details1(this.EntrustSampleId)
+            } else {
+              this.$message({
+                type: 'warning',
+                message: response.data.message
+              })
+            }
+          }).catch(err => {
+          console.error(err)
+        })
+        this.typevalue = []
+      },
+      //详情
+      details(val) {
+        this.EntrustSampleId = val.Id
+        this.$axios.get("/limsentrustsample/getdetails/" + val.Id)
+          .then(response => {
+            this.testdetails = response.data.item
+            this.testtypes = response.data.types
+          })
+        this.detailsDialog = true
+      },
+      details1(id) {
+        this.$axios.get("/limsentrustsample/getdetails/" + id)
+          .then(response => {
+            this.testdetails = response.data.item
+            this.testtypes = response.data.types
+          })
+        this.detailsDialog = true
+      },
+      //ln
+
+      //发送
+      transportShow() {
+        if (this.mainForm.DeliverStatus == 0) {
+          this.getDeliverNo()
+        } else {
+          this.getDeliverInfo()
+        }
+        this.transportDialog = true
+      },
+      getDeliverInfo() {
+        let _this = this
+        let params = {
+          ServiceId: _this.mainForm.Id
+        }
+        _this.$axios.get('/limsdeliver/deliverinfo', {
+          params
+        })
+          .then(res => {
+            _this.deliverForm = res.data.items
+          }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
+      saveDeliver() {
+        if (this.mainForm.DeliverStatus == 0) {
+          this.addDeliver('deliverForm')
+        } else if (this.mainForm.DeliverStatus == 1) {
+          this.editDeliver('deliverForm')
+        }
+      },
+      addDeliver(formName) {
+        let _this = this
+        this.$refs['deliverForm'].validate((valid) => {
+          if (valid) {
+            _this.deliverForm.EId = _this.mainForm.Id
+            _this.deliverForm.EntrustNo = _this.mainForm.EntrustNo
+            _this.deliverForm.DetectSampleId = parseInt(_this.mainForm.DetectSampleId)
+            _this.deliverForm.DetectSample = _this.mainForm.DetectSample
+            _this.deliverForm.EntrustType = _this.mainForm.EntrustType
+            _this.deliverForm.EntrustTypeId = parseInt(_this.mainForm.EntrustTypeId)
+            _this.deliverForm.Unit = _this.mainForm.Unit
+            _this.deliverForm.SampleNum = parseFloat(_this.mainForm.SampleNum)
+            _this.$axios.post('/limsdeliver/savedeliver', _this.deliverForm)
+              .then(function (response) {
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: '添加成功'
+                  })
+                  _this.transportDialog = false
+                  _this.getEntrustInfo()
+                  _this.getSampleList()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: '添加失败'
+                  })
+                }
+              })
+          } else {
+            console.log('error submit!!')
+            return false
+          }
+        })
+      },
+      editDeliver(formName) {
+        let _this = this
+        this.$refs['deliverForm'].validate((valid) => {
+          if (valid) {
+            _this.$axios.put('/limsdeliver/editdeliver/' + _this.deliverForm.Id, _this.deliverForm)
+              .then(function (response) {
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: '添加成功'
+                  })
+                  _this.transportDialog = false
+                  _this.getEntrustInfo()
+                  _this.getSampleList()
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: '添加失败'
+                  })
+                }
+              })
+          } else {
+            console.log('error submit!!')
+            return false
+          }
+        })
+      },
+      sendTransport() {
+        if (this.deliverForm.Sender || this.deliverForm.Sender != '') {
+          this.deliverForm.ISsend = 1
+          this.editDeliver()
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '发件人不能为空，请填写发件人！'
+          })
+        }
+      },
+
+      auditor() {
+        let _this = this
+        _this.$confirm("确定审核该检测计划?审核后所有信息将不可修改！", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            if (_this.shenheForm.SuccessStatus === 0) {
+              _this.mainForm.EntrustStatus = 1
+            } else {
+              _this.mainForm.EntrustStatus = 2
+            }
+            _this.mainForm.AuditorRemark = _this.shenheForm.AuditorRemark
+            _this.mainForm.SampleNum = parseFloat(_this.mainForm.SampleNum)
+            _this.auditorShow = false
+            _this.makesure()
+          })
+          .catch(() => {})
+      },
+      makesure() {
+        if (this.ServiceId <= 0) {
+          this.$message({
+            type: 'warning',
+            message: '记录主键不存在，不能完成审核！'
+          })
+        }
+        entrustApi.applyEntrust(this.ServiceId, this.mainForm, this.$axios).then(res => {
+          // response
+          if (res.data.code === 0) {
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.getEntrustInfo()
+            this.getSampleList()
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+
+      },
+
+      testcodec() {
+        this.$axios.get('/codesequence/GetProjectCenterDailySequence')
+          .then(res => {
+            this.sampleForm.SampleCode = res.data.items
+          });
+      },
+      getCode() {
+        if (this.ServiceId === 'add') {
+          if (this.tjz) {
+            for (var i = 0; i < this.projectTypeList.length; i++) {
+              if (this.mainForm.ProjectTypeId == this.projectTypeList[i].Id) {
+                this.templatecode = this.projectTypeList[i].TemplateCode
+                this.getReportNo()
+              }
+            }
+          } else {
+            this.getEntrustNo()
+          }
+        }
+      },
+      getEntrustNo() {
+        let _this = this
+        _this.$axios.get('orderadd/getOrderNumgene')
+          .then(function (response) {
+            _this.mainForm.EntrustNo = response.data.items + ''
+          })
+      },
+      getReportNo() {
+        let _this = this
+        let params = {
+          TemplateCode: _this.templatecode
+        }
+        _this.$axios.get('limsentrust/getentrustno', {
+          params
+        })
+          .then(function (response) {
+            _this.mainForm.EntrustNo = response.data.items + ''
+          })
+      },
+      getDeliverNo() {
+        let _this = this
+        _this.$axios.get('orderadd/getOrderNumgene')
+          .then(function (response) {
+            _this.deliverForm.DeliverNo = response.data.items + ''
+          })
+      },
+      //判断组织结构确定流程
+      getOrganizeListById() {
+        let _this = this
+        _this.$axios.get('/limsentrust/getstyle')
+          .then(
+            function (response) {
+              _this.departmentList = response.data.items
+              let arr = _this.departmentList.split(',')
+              for (var i = 0; i < arr.length; i++) {
+                if (_this.departmentId == arr[i]) {
+                  _this.tjz = true
+                  // _this.mainForm.EntrustTypeId = 329 //委托检测
+                }
+              }
+            }).catch(function (error) {
+              console.log(error)
+            })
+      },
+      balanceaction(){
+        this.balanceShow=true
+        this.getpartuserlist(this.mainForm.DataTemplateId)
+      },
+      getDictList() {
+        docTemplateApi.getDictList(this.$axios).then(res => {
+          this.docTemplateDictList = res.data;
+        });
+      },
+      getpartuserlist(val) {
+        this.partuserlist = ""
+        let docTempType = '';
+        for (let idx in this.docTemplateDictList) {
+          if (val == this.docTemplateDictList[idx].Id) {
+            docTempType = this.docTemplateDictList[idx].TemplateCode;
+          }
+        }
+
+        if (val != "") {
+          if (docTempType === "DAYT.LightProtect.Report" || docTempType === "DAYT.Equipotent.Report") {
+            this.lightpermission = true
+          } else {
+            this.lightpermission = false
+          }
+        }
+        let _this = this
+        _this.$axios.get('limsbalance/partuserlist?LightPermission=' + this.lightpermission, {})
+          .then(res => {
+            // response
+            _this.partuserlist = res.data.items
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      //获取委托类型
+      getEntypeList() {
+        let _this = this
+        _this.$axios.get('/items/worditem?code=DelegateType', {})
+          .then(res => {
+            _this.entypeList = res.data
+          })
+      },
+      //委托方名称下拉
+      getCustomer() {
+        let _this = this
+        _this.$axios.get('/customer/customerlist', {})
+          .then(res => {
+            // response
+            _this.customerList = res.data.items
+            for (var i = 0; i < res.data.items.length; i++) {
+              if (res.data.items[i].ViceBusiness == '大港油田') {
+                _this.groupOptions[0].options.push(res.data.items[i])
+              } else {
+                _this.groupOptions[1].options.push(res.data.items[i])
+              }
+            }
+          })
+      },
+      //下拉选择委托方
+      chooseCustomer() {
+        let _this = this
+        for (var i = 0; i < _this.customerList.length; i++) {
+          if (_this.customerList[i].Id == _this.mainForm.CustomerId) {
+            _this.mainForm.CustomerCode = _this.customerList[i].CustomerCode
+            _this.mainForm.CustomerPerson = _this.customerList[i].Person
+            _this.mainForm.CustomerTelephone = _this.customerList[i].Telephone
+            _this.mainForm.Address = _this.customerList[i].Address
+          }
+        }
+        this.getAddress(_this.mainForm.CustomerId)
+      },
+      //检测地点下拉
+      getAddress(CId) {
+        let _this = this
+        this.$axios.get('/limsreporthuxf/getEntrustCorp/' + CId)
+          .then(res => {
+            _this.addressList = res.data.items['PositionCheck']
+            if (!_this.tjz) {
+              if (this.addressList && this.addressList.length > 0 && !this.mainForm.AddressId) {
+                this.mainForm.AddressId = this.addressList[0].Id
+              }
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      //检测报告
+      getProjectType() {
+        let _this = this
+        _this.$axios.get('/testtype/testypetreeall', {})
+          .then(res => {
+            _this.testTypeList = res.data.items
+            if (!_this.testTypeList) {
+              return false
+            }
+            for (var i = 0; i < _this.testTypeList.length; i++) {
+              if (_this.testTypeList[i].ParentId === 0) {
+                _this.projectTypeList.push(_this.testTypeList[i])
+              }
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+
+      getCustomerInfo () {
+        let _this = this // request
+        this.$axios.get('customer/getcustomerbydepartid', {})
+          .then(res => {
+            _this.mainForm.CustomerId = res.data.items['Id']
+            _this.mainForm.CustomerName = res.data.items['CustomerName']
+            _this.mainForm.CustomerPerson = res.data.items['Person']
+            _this.mainForm.CustomerTelephone = res.data.items['Telephone']
+            _this.mainForm.Address = res.data.items['Address']
+            _this.getAddress(_this.mainForm.CustomerId)
+          }).catch(err => {
+            // handle error
+            console.error(err)
+        })
+      },
+
+      SampleTypeChangeHandler() {
+        this.mainForm.DetectSampleId = ''
+        this.selectedorg = []
+        this.getCode()
+        this.getSampleType()
+      },
+
+      // 获取样品数量单位
+      getsamplesnumlist() {
+        let _this = this
+        _this.$axios.get('/items/worditem?code=SamplesNum', {})
+          .then(res => {
+            _this.sampeunitlist = res.data
+          })
+      },
+      //样品名称
+      getSampleTypeOrigList() {
+        let _this = this
+        _this.$axios.get('/limsampletype/sampletypetree', {})
+          .then(function (res) {
+            _this.sampleTypeOrigList = res.data.items
+            if (_this.mainForm.ProjectTypeId && _this.mainForm.ProjectTypeId != 0) {
+              _this.getSampleType(_this.mainForm.ProjectTypeId)
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      getSampleType() {
+        let _this = this
+        _this.sampleTypeList = []
+        for (var i = 0; _this.sampleTypeOrigList && i < _this.sampleTypeOrigList.length; i++) {
+          if (_this.sampleTypeOrigList[i].ProjectTypeId == _this.mainForm.ProjectTypeId) {
+            _this.sampleTypeList.push(_this.sampleTypeOrigList[i])
+          }
+        }
+        if (_this.sampleTypeList.length == 1) {
+          _this.selectedorg.push(_this.sampleTypeList[0].Id)
+        } else if (_this.sampleTypeList.length > 1) {
+          _this.selectedorg.push(_this.sampleTypeList[1].Id)
+          for (var j = 0; j < _this.sampleTypeList.length; j++) {
+            if (_this.sampleTypeList[j].ParentId == _this.sampleTypeList[1].Id) {
+              _this.selectedorg.push(_this.sampleTypeList[j].Id)
+            }
+          }
+        }
+        _this.sampleTypeTreeList = window.toolfun_gettreejson(_this.sampleTypeList, 'Id', 'ParentId',
+          'Id,FullName')
+      },
+      getDetectSampleName(sampleId) {
+        let ret = ''
+        for (let idx in this.sampleTypeList) {
+          if (sampleId === this.sampleTypeList[idx].Id) {
+            ret = this.sampleTypeList[idx].FullName
+          }
+        }
+        return ret;
+      },
+      SamplePropertyHandler() {
+        let _this = this
+        var sampleid = _this.selectedorg[_this.selectedorg.length - 1]
+        this.$axios.get('limsampletype/getsampleproperty/' + sampleid, {})
+          .then(res => {
+            _this.sampleForm.ISexchange = res.data.items.ISdeliver
+            _this.sampleForm.ISprepare = res.data.items.ISprepare
+            _this.sampleForm.PrepareNum = res.data.items.PrepareNum
+            _this.sampleForm.ISreveive = res.data.items.ISreveive
+            _this.sampleForm.ReveiveNum = res.data.items.ReveiveNum
+          }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
+      //获取权限
+      getPermissions() {
+        let _this = this
+        // request
+        let params = {
+          percodes: `'${this.permissionscode.add}','${this.permissionscode.edit}','${this.permissionscode.balance}'`
+        }
+        this.$axios.get('/permissions/isauths', {
+          params
+        })
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              res.data.forEach(element => {
+                _this.permissions[element.Code] = element.Isperm
+              });
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+    }
+  }
+
+</script>
+
+<style lang="scss">
+  .entrustcard .el-card__header {
+    padding: 5px 10px;
+    font-size: 10px;
+  }
+
+  .delivercard .el-button--mini {
+    padding: 2px
+  }
+
+  .deliverFormcss .el-card__header {
+    padding: 5px 10px;
+    font-size: 10px;
+  }
+
+  .delivercard .el-button--mini {
+    padding: 2px
+  }
+
+  .cellcaijiattr div {
+    margin-top: -4px;
+    color: #4F94CD;
+    cursor: pointer;
+  }
+
+  .cellcaijiattr div span {
+    float: right;
+  }
+
+  .collectionattrbtncss .el-button {
+    padding: 12px 2px;
+    font-size: 12px;
+  }
+
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
+
+  .entrustformcss .el-col-8 {
+    height: 58px;
+  }
+
+</style>

src/dashoo.cn/frontend_web/src/pages/lims/taskplan/index.vue

@@ -0,0 +1,467 @@
+<template>
+  <div>
+    <el-card class="box-card" style="height: calc(100vh - 92px);">
+      <div slot="header" style="height: 20px;">
+        <span style="float: left;">
+          <i class="icon icon-table2"></i>
+        </span>
+        <el-breadcrumb class="heading" style="float: left; margin-left: 5px">
+          <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+          <el-breadcrumb-item :to="{ path: '/lims/taskplan' }">检测任务</el-breadcrumb-item>
+        </el-breadcrumb>
+        <span style="float: right;">
+          <router-link :to="'/lims/taskplan/add/operation'">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
+          </router-link>
+        </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="委托时间">
+            <el-date-picker size="mini" style="width: 220px" v-model="EntrustTime" type="daterange" range-separator="至"
+                            start-placeholder="委托日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item label="委托单号">
+            <el-input size="mini" style="width: 165px;" v-model="searchform.entrustno" placeholder="请输入委托单号"></el-input>
+          </el-form-item>
+
+          <!--<el-form-item label="签发状态">
+            <el-select size="mini" style="width: 90px;" v-model="searchform.ReportStatus" placeholder="请选择">
+              <el-option label="未签发" value="0"></el-option>
+              <el-option label="已签发" value="2"></el-option>
+            </el-select>
+          </el-form-item>-->
+
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="seachdata" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="entrustList" border height="calc(100vh - 230px)" style="width: 100%;" @sort-change="orderby">
+        <el-table-column label="操作" width="150" align="center" fixed>
+          <template slot-scope="scope">
+            <router-link :to="'/lims/tasksentrust/'+scope.row.Id+'/operation'">
+              <el-button type="primary" plain size="mini">编辑</el-button>
+            </router-link>
+            <!--<el-button :disabled="scope.row.EntrustStatus==0" type="primary" plain size="mini" title="" style="margin-left:3px;"
+              @click="entrustPrint(scope.row)">打印</el-button>-->
+            <el-button type="primary" plain size="mini" style="margin-left:3px" :disabled="scope.row.EntrustStatus != '0' || !permissions[permissionscode.delete]"
+                       @click="delEntrust(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="EntrustNo" sortable mini-width="170" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="EntrustType" sortable mini-width="150" label="委托类型" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ProjectType" sortable mini-width="150" label="检测报告" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DetectSample" sortable mini-width="220" label="样品名称" align="center"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="CustomerName" sortable mini-width="220" label="委托方名称" align="center"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="EntrustTime" sortable mini-width="240" label="委托时间" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.EntrustTime+'') }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="EntrustStatus" sortable label="分配状态" align="center" mini-width="120">
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.EntrustStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="已分配"
+                      type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.EntrustStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="未分配"
+                      type="warning">
+            </el-alert>
+          </template>
+        </el-table-column>
+        <!--<el-table-column prop="DeliverStatus" sortable label="交接状态" align="center" mini-width="120" v-if="!tjz">
+          <template slot-scope="scope">
+            <el-tag size="small" v-show="scope.row.DeliverStatus=='0'" type="danger">未交接</el-tag>
+            <el-tag size="small" v-show="scope.row.DeliverStatus=='1'" type="warning">待交接</el-tag>
+            <el-tag size="small" v-show="scope.row.DeliverStatus=='2'" type="warning">已发送</el-tag>
+            <el-tag size="small" v-show="scope.row.DeliverStatus=='3'" type="success">已交接</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="ReportStatus" sortable label="签发状态" align="center" mini-width="120">
+          <template slot-scope="scope">
+            <el-tag size="small" v-show="scope.row.ReportStatus=='0'" type="warning">未签发</el-tag>
+            <el-tag size="small" v-show="scope.row.ReportStatus=='2'" type="success">已签发</el-tag>
+          </template>
+        </el-table-column>-->
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+      </el-pagination>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="700px">
+      <el-form ref="advancedSearchForm" label-width="90px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="委托时间">
+              <el-date-picker size="mini" v-model="EntrustTime" type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="委托日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托单号">
+              <el-input size="mini" v-model="searchform.entrustno" style="width:100%" placeholder="请输入委托单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方名称">
+              <el-select size="mini" ref="reflrrselect" style="width:100%" v-model="searchform.CustomerId" clearable>
+                <el-option v-for="item in customerlist" :label="item.CustomerName" :value="item.Id" :key="item.Id"  ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!--<el-col :span="12">
+            <el-form-item label="签发状态">
+              <el-select size="mini" v-model="searchform.ReportStatus" style="width:100%" placeholder="请选择" clearable>
+                <el-option label="未签发" value="0"></el-option>
+                <el-option label="已签发" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>-->
+          <el-col :span="12">
+            <el-form-item label="检测报告">
+              <el-select size="mini" ref="reflrrselect" v-model="searchform.ProjectTypeId" style="width:100%" clearable>
+                <el-option v-for="item in projectList" :label="item.FullName" :value="item.Id" :key="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!--<el-col :span="12">
+            <el-form-item label="样品名称">
+              <el-select size="mini" ref="reflrrselect" v-model="searchform.DetectSampleId" style="width:100%"
+                clearable>
+                <el-option v-for="item in sampleList" :label="item.FullName" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>-->
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="seachdata">查 询</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/lims/limsentrust'
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+
+    name: 'sampletype',
+    data() {
+      return {
+        dialogVisible: false,
+        searchform: {
+          entrustno: '',
+          EntrustTypeId: '',
+          ProjectTypeId: '',
+          detectsample: '',
+          CustomerId: '',
+          ReportStatus: '',
+        },
+        sampletypelist: [], //委托方名称
+        EntrustTime: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()], // 委托日期
+        currentItemCount: 0,
+        currentPage: 1,
+        size: 10,
+        entrustList: [],
+        customerlist: [],
+        projectList: [],
+        //样品名称
+        sampleList: [],
+        departmentList: [], //特检站下属部门
+        departmentId: '',
+        tjz: false,
+        permissionscode: {
+          add: 'lims.entrust.add',
+          delete: 'lims.entrust.delete',
+        },
+        permissions: {
+          'lims.entrust.add': false,
+          'lims.entrust.delete': false,
+        },
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+      }
+    },
+    created() {
+      let countstatus = this.$route.query.CountStatus //首页路由数据，总数
+      this.departmentId = this.authUser.Profile.DepartmentId
+      this.initdata()
+      this.getCustomerlist()
+      this.getProjectType()
+      this.getSamplelist()
+      //判断组织结构
+      this.getOrganizeListById()
+      this.getPermissions() //权限
+    },
+    methods: {
+      initdata() {
+        let _this = this;
+        let EntrustTime = []
+        if (!_this.EntrustTime) {
+          _this.EntrustTime = []
+        }
+        // 解析时间
+        if (_this.EntrustTime.length == 2) {
+          _this.EntrustTime[1].setHours(23)
+          _this.EntrustTime[1].setMinutes(59)
+          _this.EntrustTime[1].setSeconds(59)
+          EntrustTime.push(_this.formatDateTime(_this.EntrustTime[0]))
+          EntrustTime.push(_this.formatDateTime(_this.EntrustTime[1]))
+        }
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop
+        }
+        Object.assign(params, this.searchform)
+        api.entrustList(EntrustTime.join(','), params, this.$axios)
+          .then(
+            function (response) {
+              _this.entrustList = response.data.items
+              _this.currentItemCount = response.data.currentItemCount
+            }).catch(
+          function (error) {
+            console.log(error);
+          });
+      },
+
+      delEntrust(val) {
+        let _this = this;
+        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            _this.$axios
+              .delete("limsentrust/entrustdelete/" + val.Id + '?EntrustNo=' + val.EntrustNo, {})
+              .then(function (response) {
+                // response
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: "success",
+                    message: response.data.message
+                  });
+                  // 更新界面
+                  _this.initdata();
+                } else {
+                  _this.$message({
+                    type: "warning",
+                    message: response.data.message
+                  });
+                }
+              })
+              .catch(function (error) {
+                console.log(error);
+              });
+          })
+          .catch(() => {});
+      },
+
+      //判断组织结构确定流程
+      getOrganizeListById() {
+        let _this = this;
+        _this.$axios.get('/limsentrust/getstyle')
+          .then(
+            function (response) {
+              _this.departmentList = response.data.items
+              let arr = _this.departmentList.split(',')
+              for (var i = 0; i < arr.length; i++) {
+                if (_this.departmentId == arr[i]) {
+                  _this.tjz = true
+                }
+              }
+            }).catch(
+          function (error) {
+            console.log(error);
+          })
+      },
+
+      //委托方名称下拉
+      getCustomerlist() {
+        let _this = this
+        _this.$axios.get('/customer/customerlist', {})
+          .then(res => {
+            _this.customerlist = res.data.items
+          })
+      },
+
+      //项目名称下拉
+      getProjectType() {
+        let _this = this
+        _this.$axios.get('/testtype/testypetreeall', {})
+          .then(res => {
+            _this.projectList = res.data.items
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      //样品类型下拉
+      getSamplelist() {
+        // request
+        this.$axios.get('/limsampletype/smpletypelist', {})
+          .then(res => {
+            // response
+            this.sampleList = res.data.items
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      //打印
+      entrustPrint(val) {
+        var Id = val.Id
+        var accCode = this.authUser.Profile.AccCode
+
+        if (Id === '' || accCode === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择需要打印的检验项目!'
+          })
+          return
+        }
+        // 执行打印操作
+        window.PrintReport('limsentrustreport', `entrustprinting,` + Id + `,` + accCode)
+      },
+
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initdata()
+      },
+
+      //获取权限
+      getPermissions() {
+        let _this = this
+        // request
+        let params = {
+          percodes: `'${this.permissionscode.add}','${this.permissionscode.delete}'`
+        }
+        this.$axios.get('/permissions/isauths', {
+          params
+        })
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              res.data.forEach(element => {
+                _this.permissions[element.Code] = element.Isperm
+              });
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+
+      clearSearch() {
+        this.searchform.entrustno = ''
+        this.searchform.EntrustTypeId = ''
+        this.searchform.ProjectTypeId = ''
+        this.searchform.detectsample = ''
+        this.searchform.CustomerId = ''
+        this.EntrustTime = []
+        this.searchform.ReportStatus = ''
+        this.initdata()
+      },
+
+      seachdata() {
+        this.currentPage = 1
+        this.initdata()
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initdata()
+      },
+
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initdata()
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 19)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
+
+  .plab {
+    font-size: 13px;
+    color: #999;
+  }
+
+  .daiyunscss {
+    cursor: pointer;
+  }
+
+</style>

src/dashoo.cn/frontend_web/src/pages/lims/tasksentrust/_opera/operation.vue

@@ -74,7 +74,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="!tjz">
-            <el-form-item label="检测地点">
+            <el-form-item label="检测地点" required>
               <el-select ref="refAddress" v-model="mainForm.AddressId" style="width:100%" placeholder="请选择检测地点">
                 <el-option v-for="item in addressList" :key="item.Id" :label="item.PositionName" :value="item.Id">
                 </el-option>
@@ -1467,7 +1467,6 @@
             if (!_this.tjz) {
               if (this.addressList && this.addressList.length > 0 && !this.mainForm.AddressId) {
                 this.mainForm.AddressId = this.addressList[0].Id
-                console.log("----address---", this.mainForm.AddressId)
               }
             }
           })

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/index.vue

@@ -24,7 +24,7 @@
                          placeholder="请选择组织"></el-cascader>
           </el-form-item>
 
-          <el-form-item>
+          <!--<el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
               <el-dropdown-menu slot="dropdown">
@@ -32,7 +32,7 @@
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-          </el-form-item>
+          </el-form-item>-->
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
@@ -260,7 +260,7 @@
         // 查询条件
         Object.assign(params, this.searchForm)
         // 访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        api.getList('', params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {