检测计划BUG修复

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

@@ -467,7 +467,7 @@ func (this *LimsEnturstController) EditEntrust() {
 	svc := limsentrust.GetLimsEnturstService(utils.DBE)
 
 	opdesc := "委托单-" + model.EntrustNo
-	var cols []string = []string{"EntrustNo", "EntrustTime", "EndTime", "EntrustStatus", "EntrustType", "EntrustTypeId", "CustomerId", "CustomerName", "CustomerPerson", "CustomerTelephone", "AddressId", "Address", "ProjectType", "ProjectTypeId", "DetectSample", "DetectSampleId", "Samplelist", "SampleNum", "SampleCode", "Unit", "IsPlan", "Remarks", "ModifiedUserId", "ModifiedBy"}
+	var cols []string = []string{"EntrustNo", "EntrustTime", "EndTime", "EntrustStatus", "EntrustType", "EntrustTypeId", "CustomerId", "CustomerName", "CustomerPerson", "CustomerTelephone", "AddressId", "Address", "ProjectType", "ProjectTypeId", "DetectSample", "DetectSampleId", "Samplelist", "SampleNum", "SampleCode", "Unit", "Remarks", "ModifiedUserId", "ModifiedBy"}
 	err := svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+LimsEntrustMainName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "委托管理")
 	if err == nil {
 		errinfo.Message = "操作成功！"

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

@@ -21,10 +21,10 @@
         </el-breadcrumb>
 
         <span style="float: right;">
-          <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px"
+          <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px" v-if="permissions[permissionscode.receive] && this.mainForm.EntrustStatus<0"
                      @click="ReceiveEntrustNo">接收计划</el-button>
 
-          <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px"
+          <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px" v-if="permissions[permissionscode.save]  && (this.mainForm.Id=='' || this.mainForm.EntrustStatus<0)"
                      @click="trueEntrustNo">保存</el-button>
 
           <router-link :to="'/lims/taskplan'">
@@ -170,7 +170,7 @@
 
       <div v-if="mainForm.Id > 0">
         <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-          <el-table-column label="操作" width="100px" fixed>
+          <el-table-column label="操作" width="100px" fixed v-if="this.mainForm.EntrustStatus<0">
             <template slot-scope="scope">
               <el-button type="plain" plain size="mini" @click="delEntrustEquipment(scope.row.Id)">删除</el-button>
             </template>
@@ -519,14 +519,12 @@
         },
         lightpermission: false,
         permissionscode: {
-          add: 'lims.deliver.add',
-          edit: 'lims.entrust.edit',
-          balance: 'lims.balance.edit',
+          save: 'lims.taskplan.save',
+          receive: 'lims.taskplan.receive'
         },
         permissions: {
-          'lims.deliver.add': false,
-          'lims.entrust.edit': false,
-          'lims.balance.edit': false,
+          'lims.taskplan.save': false,
+          'lims.taskplan.receive': false
         },
       }
     },
@@ -1535,11 +1533,11 @@
         })
       },
       //获取权限
-      getPermissions() {
+      getPermissions () {
         let _this = this
         // request
         let params = {
-          percodes: `'${this.permissionscode.add}','${this.permissionscode.edit}','${this.permissionscode.balance}'`
+          percodes: `'${this.permissionscode.save}','${this.permissionscode.receive}'`
         }
         this.$axios.get('/permissions/isauths', {
           params
@@ -1548,7 +1546,7 @@
             if (res.data instanceof Array && res.data.length > 0) {
               res.data.forEach(element => {
                 _this.permissions[element.Code] = element.Isperm
-              });
+              })
             }
           })
           .catch(err => {

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

@@ -49,7 +49,7 @@
             </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="plain" size="mini" style="margin-left:3px" :disabled="scope.row.EntrustStatus > 0"
+            <el-button type="plain" size="mini" style="margin-left:3px" :disabled="scope.row.EntrustStatus >= 0"
                        @click="delEntrust(scope.row)">删除</el-button>
           </template>
         </el-table-column>