检测计划生成编码

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

@@ -171,7 +171,7 @@ module.exports = {
      'pages/lims/preparation/**/*.*',
      'pages/lims/tasksbalance/**/*.*',
      // 'pages/system/**/*.*',
-     'pages/setting/**/*.*',
+     // 'pages/setting/**/*.*',
      'pages/prototype/**/*.*',
      'pages/material/**/*.*',
      'pages/report/**/*.*',

src/dashoo.cn/frontend_web/package.json

@@ -26,7 +26,7 @@
     "chart.js": "^2.7.0",
     "cross-env": "^5.1.1",
     "echarts": "^3.8.5",
-    "element-ui": "^2.9.1",
+    "element-ui": "2.9.1",
     "es6-promise": "^4.1.1",
     "highcharts": "^5.0.15",
     "js-cookie": "^2.1.4",

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

@@ -322,18 +322,19 @@
                     class="input-with-select"
                     @change="CheckCycleDate"
                     readonly>
-            <el-select v-model="formData.CycleUnit"
-                       slot="append"
-                       placeholder="请选择"
-                       style="width: 85px"
-                       disabled>
-              <el-option label="年"
-                         value="年"></el-option>
-              <el-option label="月"
-                         value="月"></el-option>
-              <el-option label="天"
-                         value="天"></el-option>
-            </el-select>
+            <template slot="append">{{formData.CycleUnit}}</template>
+            <!--<el-select v-model="formData.CycleUnit"-->
+                       <!--slot="append"-->
+                       <!--placeholder="请选择"-->
+                       <!--style="width: 85px"-->
+                       <!--disabled>-->
+              <!--<el-option label="年"-->
+                         <!--value="年"></el-option>-->
+              <!--<el-option label="月"-->
+                         <!--value="月"></el-option>-->
+              <!--<el-option label="天"-->
+                         <!--value="天"></el-option>-->
+            <!--</el-select>-->
           </el-input>
         </el-form-item>
         <el-form-item label="备注"

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

@@ -1285,9 +1285,9 @@
             this.sampleForm.SampleCode = res.data.items
           })
       },
-      getCode () {
+      getCode (id) {
         if (this.ServiceId === 'add') {
-          if (this.tjz) {
+          if (id === 179 || id === 187 || id === 286 || id === 181) {
             for (var i = 0; i < this.projectTypeList.length; i++) {
               if (this.mainForm.ProjectTypeId === this.projectTypeList[i].Id) {
                 this.templatecode = this.projectTypeList[i].TemplateCode
@@ -1470,10 +1470,10 @@
           })
       },
 
-      SampleTypeChangeHandler () {
+      SampleTypeChangeHandler (id) {
         this.mainForm.DetectSampleId = ''
         this.selectedorg = []
-        this.getCode()
+        this.getCode(id)
         this.getSampleType()
 
         this.currentPage = 1

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

@@ -1436,6 +1436,7 @@
         let params = {
           TemplateCode: _this.templatecode
         }
+        console.log(params, 'paramsparamsparamsparams')
         _this.$axios.get('limsentrust/getentrustno', {
             params
           })

src/dashoo.cn/frontend_web/src/pages/setting/testtype.vue

@@ -282,7 +282,9 @@
         this.$refs['testypeForm'].validate((valid) => {
           if (valid) {
             _this.testypeForm.DepartmentId = parseInt(_this.selectedorg[_this.selectedorg.length - 1])
-            _this.testypeForm.Department = this.$refs.refDepartment.currentLabels[this.$refs.refDepartment.currentLabels.length - 1]
+            console.log(this.$refs.refDepartment.getCheckedNodes())
+            let arr = _this.$refs.refDepartment.getCheckedNodes()[0].pathLabels
+            _this.testypeForm.Department = arr[arr.length - 1]
             if (_this.testypeForm.TemplateId > 0) {
               _this.testypeForm.TemplateName = _this.$refs.refTemplateId.selectedLabel + ''
               _this.testypeForm.TemplateId = parseInt(_this.testypeForm.TemplateId)