宇信问题修改

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

@@ -768,18 +768,18 @@ func (this *LimsEnturstController) TaskBalance() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsEntrustMainName, &entity, cols, where)
 
 		if err == nil {
-			errinfo.Message = "操作成功！"
+			errinfo.Message = "分配完成！"
 			errinfo.Code = 0
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		} else {
-			errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
+			errinfo.Message = "分配失败！" + utils.AlertProcess(err.Error())
 			errinfo.Code = -1
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
 	} else {
-		errinfo.Message = "操作失败！" + utils.AlertProcess(err_add.Error())
+		errinfo.Message = "分配失败！" + utils.AlertProcess(err_add.Error())
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()

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

@@ -60,9 +60,9 @@
         </el-table-column>
         <el-table-column prop="CheckStatus" sortable label="录入状态" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-tag v-show="scope.row.CheckStatus=='0'" type="warning">未校核</el-tag>
+            <el-tag v-show="scope.row.CheckStatus=='0'" type="warning">待录入</el-tag>
             <el-tag v-show="scope.row.CheckStatus=='1'" type="warning">待校核</el-tag>
-            <el-tag v-show="scope.row.CheckStatus=='2'" type="success">校核通过</el-tag>
+            <el-tag v-show="scope.row.CheckStatus=='2'" type="success">待审核</el-tag>
             <el-tag v-show="scope.row.CheckStatus=='3'" type="danger">校核未通过</el-tag>
             <el-tag v-show="scope.row.CheckStatus=='4'" type="success">审核通过</el-tag>
             <el-tag v-show="scope.row.CheckStatus=='5'" type="danger">审核未通过</el-tag>

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/alltask.vue

@@ -148,7 +148,7 @@
         <el-table-column sortable min-width="110" align="center" prop="CheckStatus" label="审核状态">
           <template slot-scope="scope">
              <el-alert v-if="scope.row.CheckStatus=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="校核通过"
+             title="待审核"
              type="success">
              </el-alert>
              <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
@@ -156,7 +156,7 @@
              type="success">
              </el-alert>
              <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-             title="未校核"
+             title="待录入"
              type="info">
              </el-alert>
               <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
@@ -232,7 +232,7 @@
               <el-select size="mini" v-model="searchform.CheckStatus" 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-option label="待审核" value="2"></el-option>
                 <el-option label="校核未通过" value="3"></el-option>
                 <el-option label="审核通过" value="4"></el-option>
                 <el-option label="审核未通过" value="5"></el-option>

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

@@ -149,13 +149,13 @@
         <el-table-column sortable min-width="130" align="center" prop="CheckStatus" label="审核状态">
           <template slot-scope="scope">
             <el-alert v-if="scope.row.CheckStatus=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="校核通过" type="success">
+              title="待审核" type="success">
             </el-alert>
             <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="审核通过" type="success">
             </el-alert>
             <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="未校核" type="info">
+              title="待录入" type="info">
             </el-alert>
             <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待校核" type="warning">
@@ -227,7 +227,7 @@
               <el-select size="mini" v-model="searchform.CheckStatus" 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-option label="待审核" value="2"></el-option>
                 <el-option label="校核未通过" value="3"></el-option>
                 <el-option label="审核通过" value="4"></el-option>
                 <el-option label="审核未通过" value="5"></el-option>

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/tacktodo.vue

@@ -112,13 +112,13 @@
         <el-table-column sortable min-width="110" align="center" prop="CheckStatus" label="审核状态">
           <template slot-scope="scope">
             <el-alert v-if="scope.row.CheckStatus=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="校核通过" type="success">
+              title="待审核" type="success">
             </el-alert>
             <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="审核通过" type="success">
             </el-alert>
             <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="未校核" type="info">
+              title="待录入" type="info">
             </el-alert>
             <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="待校核" type="warning">
@@ -129,9 +129,9 @@
             <el-alert v-if="scope.row.CheckStatus=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
               title="校核未通过" type="error">
             </el-alert>
-            <!-- <el-tag v-show="scope.row.CheckStatus=='0'" type="info" style="background:#FFFFFF" >未校核</el-tag>
+            <!-- <el-tag v-show="scope.row.CheckStatus=='0'" type="info" style="background:#FFFFFF" >待录入</el-tag>
             <el-tag v-show="scope.row.CheckStatus=='1'" type="warning" >待校核</el-tag>
-            <el-tag v-show="scope.row.CheckStatus=='2'" type="success" style="background:#FFFFFF">校核通过</el-tag>
+            <el-tag v-show="scope.row.CheckStatus=='2'" type="success" style="background:#FFFFFF">待审核</el-tag>
             <el-tag v-show="scope.row.CheckStatus=='3'" type="danger" style="background:#FFFFFF">校核未通过</el-tag>
             <el-tag v-show="scope.row.CheckStatus=='4'" type="success" >审核通过</el-tag>
             <el-tag v-show="scope.row.CheckStatus=='5'" type="danger" >审核未通过</el-tag> -->
@@ -196,7 +196,7 @@
               <el-select size="mini" v-model="searchform.CheckStatus" 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-option label="待审核" value="2"></el-option>
                 <el-option label="校核未通过" value="3"></el-option>
                 <el-option label="审核通过" value="4"></el-option>
                 <el-option label="审核未通过" value="5"></el-option>
@@ -214,7 +214,7 @@
       <el-form :model="jiaoheForm" label-width="130px" ref="jiaoheForm">
         <el-form-item label="校核状态">
           <template>
-            <el-radio class="radio" v-model="jiaoheForm.SuccessStatus" :label="2">校核通过</el-radio>
+            <el-radio class="radio" v-model="jiaoheForm.SuccessStatus" :label="2">待审核</el-radio>
             <el-radio class="radio" v-model="jiaoheForm.SuccessStatus" :label="3">校核未通过</el-radio>
           </template>
         </el-form-item>

src/dashoo.cn/frontend_web/src/pages/lims/reportairfoamgenerator/subdata/datalist.vue

@@ -11,9 +11,9 @@
           <i class="icon icon-table2"></i> 空气泡沫数据
         </span>
         <span style="float: right;">
+          <el-button type="plain" size="mini" style="margin-right:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
           <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
-          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
           <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
                      <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
 

src/dashoo.cn/frontend_web/src/pages/lims/reportairfoamgenerator/subdata/dataopera.vue

@@ -141,8 +141,7 @@
                   width="500"
                   slot="append"
                   trigger="click">
-                  <el-select v-model="Problems.ProblemLocation1" filterable placeholder="位置" style="width: 24%"
-                             @change="setRemark1">
+                  <el-select v-model="Problems.ProblemLocation1" filterable placeholder="位置" style="width: 24%">
                     <el-option
                       v-for="item in ProblemLocationOptions"
                       :key="item.Id"
@@ -153,8 +152,7 @@
                     </el-option>
                   </el-select>
                   <el-button slot="reference" size="mini" icon="el-icon-search"></el-button>
-                  <el-select v-model="Problems.CommonProblem1" filterable placeholder="常见问题" style="width: 76%"
-                             @change="setRemark1">
+                  <el-select v-model="Problems.CommonProblem1" filterable placeholder="常见问题" style="width: 76%">
                     <el-option
                       v-for="item in ProblemOptions"
                       :key="item.Id"
@@ -164,6 +162,9 @@
                       <span style="float: left;padding-left: 50px" >{{ item.ItemName }}</span>
                     </el-option>
                   </el-select>
+                  <div style="text-align: right; margin: 0">
+                    <el-button type="primary" size="mini" @click="setRemark1">确定</el-button>
+                  </div>
                 </el-popover>
               </el-input>
             </el-form-item>
@@ -178,8 +179,7 @@
                   width="500"
                   slot="append"
                   trigger="click">
-                  <el-select v-model="Problems.ProblemLocation2" filterable placeholder="位置" style="width: 24%"
-                             @change="setRemark2">
+                  <el-select v-model="Problems.ProblemLocation2" filterable placeholder="位置" style="width: 24%">
                     <el-option
                       v-for="item in ProblemLocationOptions"
                       :key="item.Id"
@@ -190,8 +190,7 @@
                     </el-option>
                   </el-select>
                   <el-button slot="reference" size="mini" icon="el-icon-search"></el-button>
-                  <el-select v-model="Problems.CommonProblem2" filterable placeholder="常见问题" style="width: 76%"
-                             @change="setRemark2">
+                  <el-select v-model="Problems.CommonProblem2" filterable placeholder="常见问题" style="width: 76%">
                     <el-option
                       v-for="item in ProblemOptions"
                       :key="item.Id"
@@ -201,6 +200,9 @@
                       <span style="float: left;padding-left: 50px" >{{ item.ItemName }}</span>
                     </el-option>
                   </el-select>
+                  <div style="text-align: right; margin: 0">
+                    <el-button type="primary" size="mini" @click="setRemark2">确定</el-button>
+                  </div>
                 </el-popover>
               </el-input>
             </el-form-item>
@@ -567,10 +569,18 @@
         this.formData.MainProducts = this.checkboxvalues.join(',')
       },
       setRemark1 () {
-        this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        if (this.formData.Remark1.length > 0) {
+          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        } else {
+          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        }
       },
       setRemark2 () {
-        this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        if (this.formData.Remark2.length > 0) {
+          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        } else {
+          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        }
       },
 
       setChosen () {

src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/dataopera.vue

@@ -552,8 +552,7 @@
                   width="500"
                   slot="append"
                   trigger="click">
-                  <el-select v-model="Problems.ProblemLocation1" filterable placeholder="位置" style="width: 24%"
-                             @change="setRemark1">
+                  <el-select v-model="Problems.ProblemLocation1" filterable placeholder="位置" style="width: 24%">
                     <el-option
                       v-for="item in ProblemLocationOptions"
                       :key="item.Id"
@@ -564,8 +563,7 @@
                     </el-option>
                   </el-select>
                   <el-button slot="reference" size="mini" icon="el-icon-search"></el-button>
-                  <el-select v-model="Problems.CommonProblem1" filterable placeholder="常见问题" style="width: 76%"
-                             @change="setRemark1">
+                  <el-select v-model="Problems.CommonProblem1" filterable placeholder="常见问题" style="width: 76%">
                     <el-option
                       v-for="item in ProblemOptions"
                       :key="item.Id"
@@ -575,6 +573,10 @@
                       <span style="float: left;padding-left: 50px" >{{ item.ItemName }}</span>
                     </el-option>
                   </el-select>
+
+                  <div style="text-align: right; margin: 0">
+                    <el-button type="primary" size="mini" @click="setRemark1">确定</el-button>
+                  </div>
                 </el-popover>
               </el-input>
             </el-form-item>
@@ -589,8 +591,7 @@
                   width="500"
                   slot="append"
                   trigger="click">
-                  <el-select v-model="Problems.ProblemLocation2" filterable placeholder="位置" style="width: 24%"
-                             @change="setRemark2">
+                  <el-select v-model="Problems.ProblemLocation2" filterable placeholder="位置" style="width: 24%">
                     <el-option
                       v-for="item in ProblemLocationOptions"
                       :key="item.Id"
@@ -601,8 +602,7 @@
                     </el-option>
                   </el-select>
                   <el-button slot="reference" size="mini" icon="el-icon-search"></el-button>
-                  <el-select v-model="Problems.CommonProblem2" filterable placeholder="常见问题" style="width: 76%"
-                             @change="setRemark2">
+                  <el-select v-model="Problems.CommonProblem2" filterable placeholder="常见问题" style="width: 76%">
                     <el-option
                       v-for="item in ProblemOptions"
                       :key="item.Id"
@@ -612,6 +612,9 @@
                       <span style="float: left;padding-left: 50px" >{{ item.ItemName }}</span>
                     </el-option>
                   </el-select>
+                  <div style="text-align: right; margin: 0">
+                    <el-button type="primary" size="mini" @click="setRemark2">确定</el-button>
+                  </div>
                 </el-popover>
               </el-input>
             </el-form-item>
@@ -1037,10 +1040,18 @@
           })
       },
       setRemark1 () {
-        this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        if (this.formData.Remark1.length > 0) {
+          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        } else {
+          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        }
       },
       setRemark2 () {
-        this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        if (this.formData.Remark2.length > 0) {
+          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        } else {
+          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        }
       },
       setAllPosBaseNum (num) {
         this.formData.PosBaseNum1 = num

src/dashoo.cn/frontend_web/src/pages/lims/reporthydraulicsafe/subdata/datalist.vue

@@ -11,9 +11,9 @@
           <i class="icon icon-table2"></i> 液压安全阀检测数据
         </span>
         <span style="float: right;">
+          <el-button type="plain" size="mini" style="margin-right:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
           <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
-          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
           <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
                      <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
 

src/dashoo.cn/frontend_web/src/pages/lims/reporthydraulicsafe/subdata/dataopera.vue

@@ -244,8 +244,7 @@
                     width="500"
                     slot="append"
                     trigger="click">
-                    <el-select v-model="Problems.ProblemLocation1" filterable placeholder="位置" style="width: 24%"
-                               @change="setRemark1">
+                    <el-select v-model="Problems.ProblemLocation1" filterable placeholder="位置" style="width: 24%">
                       <el-option
                         v-for="item in ProblemLocationOptions"
                         :key="item.Id"
@@ -256,8 +255,7 @@
                       </el-option>
                     </el-select>
                     <el-button slot="reference" size="mini" icon="el-icon-search"></el-button>
-                    <el-select v-model="Problems.CommonProblem1" filterable placeholder="常见问题" style="width: 76%"
-                               @change="setRemark1">
+                    <el-select v-model="Problems.CommonProblem1" filterable placeholder="常见问题" style="width: 76%">
                       <el-option
                         v-for="item in ProblemOptions"
                         :key="item.Id"
@@ -267,6 +265,9 @@
                         <span style="float: left;padding-left: 50px" >{{ item.ItemName }}</span>
                       </el-option>
                     </el-select>
+                    <div style="text-align: right; margin: 0">
+                      <el-button type="primary" size="mini" @click="setRemark1">确定</el-button>
+                    </div>
                   </el-popover>
                 </el-input>
               </el-form-item>
@@ -281,8 +282,7 @@
                     width="500"
                     slot="append"
                     trigger="click">
-                    <el-select v-model="Problems.ProblemLocation2" filterable placeholder="位置" style="width: 24%"
-                               @change="setRemark2">
+                    <el-select v-model="Problems.ProblemLocation2" filterable placeholder="位置" style="width: 24%">
                       <el-option
                         v-for="item in ProblemLocationOptions"
                         :key="item.Id"
@@ -293,8 +293,7 @@
                       </el-option>
                     </el-select>
                     <el-button slot="reference" size="mini" icon="el-icon-search"></el-button>
-                    <el-select v-model="Problems.CommonProblem2" filterable placeholder="常见问题" style="width: 76%;text-align: left"
-                               @change="setRemark2">
+                    <el-select v-model="Problems.CommonProblem2" filterable placeholder="常见问题" style="width: 76%;text-align: left">
                       <el-option
                         v-for="item in ProblemOptions"
                         :key="item.Id"
@@ -304,6 +303,9 @@
                         <span style="float: left;padding-left: 50px" >{{ item.ItemName }}</span>
                       </el-option>
                     </el-select>
+                    <div style="text-align: right; margin: 0">
+                      <el-button type="primary" size="mini" @click="setRemark2">确定</el-button>
+                    </div>
                   </el-popover>
                 </el-input>
               </el-form-item>
@@ -806,10 +808,18 @@
         }
       },
       setRemark1 () {
-        this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        if (this.formData.Remark1.length > 0) {
+          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        } else {
+          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        }
       },
       setRemark2 () {
-        this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        if (this.formData.Remark2.length > 0) {
+          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        } else {
+          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        }
       },
       setAllPosBaseNum (num) {
         this.formData.PosBaseNum1 = num

src/dashoo.cn/frontend_web/src/pages/lims/reportzuhq/subdata/datalist.vue

@@ -11,9 +11,9 @@
           <i class="icon icon-table2"></i> 阻火器数据
         </span>
         <span style="float: right;">
+          <el-button type="plain" size="mini" style="margin-right:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
            <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
-          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
           <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
                      <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
 

src/dashoo.cn/frontend_web/src/pages/lims/reportzuhq/subdata/dataopera.vue

@@ -198,8 +198,7 @@
                     width="500"
                     slot="append"
                     trigger="click">
-                    <el-select v-model="Problems.ProblemLocation1" filterable placeholder="位置" style="width: 24%"
-                               @change="setRemark1">
+                    <el-select v-model="Problems.ProblemLocation1" filterable placeholder="位置" style="width: 24%">
                       <el-option
                         v-for="item in ProblemLocationOptions"
                         :key="item.Id"
@@ -210,8 +209,7 @@
                       </el-option>
                     </el-select>
                     <el-button slot="reference" size="mini" icon="el-icon-search"></el-button>
-                    <el-select v-model="Problems.CommonProblem1" filterable placeholder="常见问题" style="width: 76%"
-                               @change="setRemark1">
+                    <el-select v-model="Problems.CommonProblem1" filterable placeholder="常见问题" style="width: 76%">
                       <el-option
                         v-for="item in ProblemOptions"
                         :key="item.Id"
@@ -221,6 +219,10 @@
                         <span style="float: left;padding-left: 50px" >{{ item.ItemName }}</span>
                       </el-option>
                     </el-select>
+
+                    <div style="text-align: right; margin: 0">
+                      <el-button type="primary" size="mini" @click="setRemark1">确定</el-button>
+                    </div>
                   </el-popover>
                 </el-input>
               </el-form-item>
@@ -235,8 +237,7 @@
                     width="500"
                     slot="append"
                     trigger="click">
-                    <el-select v-model="Problems.ProblemLocation2" filterable placeholder="位置" style="width: 24%"
-                               @change="setRemark2">
+                    <el-select v-model="Problems.ProblemLocation2" filterable placeholder="位置" style="width: 24%">
                       <el-option
                         v-for="item in ProblemLocationOptions"
                         :key="item.Id"
@@ -247,8 +248,7 @@
                       </el-option>
                     </el-select>
                     <el-button slot="reference" size="mini" icon="el-icon-search"></el-button>
-                    <el-select v-model="Problems.CommonProblem2" filterable placeholder="常见问题" style="width: 76%"
-                               @change="setRemark2">
+                    <el-select v-model="Problems.CommonProblem2" filterable placeholder="常见问题" style="width: 76%">
                       <el-option
                         v-for="item in ProblemOptions"
                         :key="item.Id"
@@ -258,6 +258,9 @@
                         <span style="float: left;padding-left: 50px" >{{ item.ItemName }}</span>
                       </el-option>
                     </el-select>
+                    <div style="text-align: right; margin: 0">
+                      <el-button type="primary" size="mini" @click="setRemark2">确定</el-button>
+                    </div>
                   </el-popover>
                 </el-input>
               </el-form-item>
@@ -584,10 +587,18 @@
       //   }
       // },
       setRemark1 () {
-        this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        if (this.formData.Remark1.length > 0) {
+          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        } else {
+          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        }
       },
       setRemark2 () {
-        this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        if (this.formData.Remark2.length > 0) {
+          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        } else {
+          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        }
       },
       getPwPaAvg () {
         var divisor = 0

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

@@ -857,7 +857,8 @@
         }
         let _this = this
         _this.testcodec()
-        _this.$confirm("确定分配该任务?分配后所有信息将不可修改！", "提示", {
+        _this.saveDetail()
+        /*_this.$confirm("确定分配该任务?分配后所有信息将不可修改！", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
@@ -865,7 +866,7 @@
           .then(() => {
             _this.saveDetail()
           })
-          .catch(() => {})
+          .catch(() => {})*/
       },
       saveDetail() {
         let _this = this
@@ -1386,7 +1387,6 @@
       },
       balanceaction(){
         this.balanceShow=true
-        console.log("--this.mainForm.DataTemplateId---",this.mainForm.DataTemplateId)
         this.getpartuserlist(this.mainForm.DataTemplateId)
       },
       getDictList() {
@@ -1402,7 +1402,7 @@
             docTempType = this.docTemplateDictList[idx].TemplateCode;
           }
         }
-        console.log("-----docTempType------",docTempType)
+
         if (val != "") {
           if (docTempType === "DAYT.LightProtect.Report" || docTempType === "DAYT.Equipotent.Report") {
             this.lightpermission = true
@@ -1415,7 +1415,6 @@
           .then(res => {
             // response
             _this.partuserlist = res.data.items
-            console.log("---_this.partuserlist----",_this.partuserlist)
           })
           .catch(err => {
             // handle error