任务维护bug

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

@@ -402,7 +402,7 @@ func (this *LimsEnturstController) ReceiveEntrustInfo() {
 	Id := this.Ctx.Input.Param(":id")
 	var model limsentrust.CustomerEntrustModel
 	svc := limsentrust.GetLimsEnturstService(utils.DBE)
-	sqlUpdate := "update " + this.User.AccCode + LimsEntrustMainName + " set EntrustStatus = '0', ModifiedOn=now(), ModifiedBy='" + this.User.Username + "', ModifiedUserId = '" + this.User.Id + "' where Id='" + Id + "'"
+	sqlUpdate := "update " + this.User.AccCode + LimsEntrustMainName + " set EntrustStatus = '0', ModifiedOn=now(), CreateOn=now(), CreateUserId="+ this.User.Id +", CreateBy='"+ this.User.Realname +"', ModifiedBy='" + this.User.Realname + "', ModifiedUserId = '" + this.User.Id + "' where Id='" + Id + "'"
 	svc.DBE.Exec(sqlUpdate)
 
 	this.Data["json"] = &model

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

@@ -551,9 +551,9 @@
       this.ServiceId = this.$route.params.opera
       this.departmentId = this.authUser.Profile.DepartmentId
 
-      this.getCustomerInfo()
       // request
       if (this.ServiceId === 'add') {
+        this.getCustomerInfo()
         this.pagetitle = '新增检测计划'
         this.mainForm.EntrustTypeId = 329 // 委托检测
         this.AddressChangeHandler()

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

@@ -35,7 +35,7 @@
       <el-form :model="mainForm" :rules="rulesmainForm" label-width="130px" style="min-height: calc(100vh - 189px)" ref="mainForm">
         <el-row :gutter="10" class="entrustformcss">
           <el-col :span="8">
-            <el-form-item label="检测报告" prop="ProjectTypeId">
+            <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>
@@ -47,14 +47,14 @@
               <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="委托类型" 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="委托方名称">
@@ -68,19 +68,19 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="16">
+          <el-col :span="8">
             <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" 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>
@@ -97,8 +97,8 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="tjz">
-          </el-col>
+          <!--<el-col :span="8" v-if="tjz">-->
+          <!--</el-col>-->
 
           <!-- 暂时隐藏
           <el-col :span="8">
@@ -107,16 +107,16 @@
                 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="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="请选择委托日期">
@@ -530,7 +530,7 @@
           }],
           ProjectTypeId: [{
             required: true,
-            message: '请选择检测报告',
+            message: '请选择检测项目',
             trigger: 'change'
           }],
           CustomerId: [{
@@ -591,7 +591,7 @@
         tableColumns: [
           {
             prop: 'TemplateTypeName',
-            label: '检测报告',
+            label: '检测项目',
             width: 200,
             sort: true
           },
@@ -793,18 +793,19 @@
         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()
-            }
+            // if (!_this.tjz) {
+            //   if (_this.mainForm.AddressId && _this.mainForm.AddressId > 0) { //验证检测地点
+            //     _this.saveEntity()
+            //   } else {
+            //     _this.$message({
+            //       type: 'warning',
+            //       message: '请选择检测地点！'
+            //     })
+            //   }
+            // } else {
+            //   _this.saveEntity()
+            // }
+            _this.saveEntity()
           } else {
             _this.$message({
               type: 'warning',
@@ -1550,11 +1551,11 @@
         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
-              }
-            }
+            // 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)

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

@@ -54,10 +54,10 @@
           </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="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>