Browse Source

外部单位

lining 6 years ago
parent
commit
975b515a78

+ 3 - 2
src/dashoo.cn/frontend_web/src/pages/lims/tasksentrust/_opera/operation.vue

@@ -843,7 +843,7 @@
             _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.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(',')
@@ -1522,8 +1522,9 @@
           .then(res => {
             // response
             _this.customerList = res.data.items
+            console.log(res.data.items)
             for (var i = 0; i < res.data.items.length; i++) {
-              if (res.data.items[i].IsInnerOrganize === 1) {
+              if (res.data.items[i].Isinnerorganize === 1) {
                 _this.groupOptions[0].options.push(res.data.items[i])
               } else {
                 _this.groupOptions[1].options.push(res.data.items[i])

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/lims/tasksentrust/index.vue

@@ -9,11 +9,11 @@
           <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
           <el-breadcrumb-item :to="{ path: '/lims/tasksentrust' }">检测任务</el-breadcrumb-item>
         </el-breadcrumb>
-        <!--<span style="float: right;">
+        <span style="float: right;">
           <router-link :to="'/lims/tasksentrust/addentrust/operation'">
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" :disabled="!permissions[permissionscode.add]">添加</el-button>
           </router-link>
-        </span>-->
+        </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="至"

+ 0 - 0
src/dashoo.cn/frontend_web/src/pages/externalOrganize.vue → src/dashoo.cn/frontend_web/src/pages/system/externalOrganize.vue