3
2
Selaa lähdekoodia

BF: window is not defined

yuedefeng 6 vuotta sitten
vanhempi
commit
1d1fddaf3b

+ 141 - 139
src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -1,165 +1,167 @@
 <template>
-  <div style="width: 100%; overflow-y: auto" v-loading="downloading" element-loading-text="数据拼命读取中,请稍候。。。">
-    <div slot="header" style="padding-top: 0px">
-      <el-card>
+  <no-ssr placeholder="数据拼命读取中,请稍候。。。">
+    <div style="width: 100%; overflow-y: auto" v-loading="downloading">
+      <div slot="header" style="padding-top: 0px">
+        <el-card>
         <span style="float: left; margin-top:10px;">
           <img v-if="user.photo" :src="'http://'+user.host+user.photo" class="avatar-index">
           <img v-else class="avatar-index" src="../assets/img/avatar-default.jpg" :alt="user.name"> &nbsp;[
           {{user.Realname}} ]
         </span>
-        <span style="float: right; margin-right:10px;">
+          <span style="float: right; margin-right:10px;">
           <el-form ref="form" :inline="true" style="float: right;">
             <el-form-item label="查询日期">
               <el-date-picker v-model="Getime" size="mini" type="daterange" range-separator="至" start-placeholder="开始日期"
-                end-placeholder="结束日期" style="width:200px" @change="getNewData"></el-date-picker>
+                              end-placeholder="结束日期" style="width:200px" @change="getNewData"></el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-select v-if="allshow" v-model="Department" clearable filterable placeholder="请选择公司" size="mini" style="width: 110px"
-                @change="getNewData">
+                         @change="getNewData">
                 <el-option v-for="item in departmentList" :key="item.value" :label="item.Name" :value="item.Id"></el-option>
               </el-select>
             </el-form-item>
           </el-form>
         </span>
-        <el-form ref="form" :inline="true" style="float: left; margin-left:20px;">
-          <el-form-item>
-            <router-link :to="'/lims/dataentry/tacktodo'">
-              <el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.entry]">
-                数据录入
-                <span style="color:#0000FF">【{{usertotal.EntryTotal}}】</span>
-              </el-button>
-            </router-link>
-          </el-form-item>
-          <el-form-item>
-            <router-link :to="'/lims/dataentry/tacktodo'">
-              <el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.check]">
-                数据校核
-                <span style="color:#0000FF">【{{usertotal.CheckTotal}}】</span>
-              </el-button>
-            </router-link>
-          </el-form-item>
-          <el-form-item>
-            <router-link :to="'/lims/dataentry/tacktodo'">
-              <el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.audit]">
-                数据审批
-                <span style="color:#0000FF">【{{usertotal.AuditTotal}}】</span>
-              </el-button>
-            </router-link>
-          </el-form-item>
-          <el-form-item>
-            <router-link :to="'/lims/createreport/reporttodo'">
-              <el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.sign]">
-                报告签发
-                <span style="color:#0000FF">【{{usertotal.SignTotal}}】</span>
-              </el-button>
-            </router-link>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <el-row :gutter="5">
-        <el-col :span="12">
-          <el-card class="box-card" style="height: calc(100vh - 350px);" v-if="!allshow">
-            <div slot="header">
-              <legend style="color:#436EEE"></legend>
-              <i class="icon icon-database"> 待办工作</i>
-            </div>
-            <el-table :data="WaitData" size="small" border height="calc(100vh - 470px)">
-              <el-table-column label="待办工作跳转" width="100" align="center" fixed>
-                <template slot-scope="scope">
-                  <el-button type="primary" plain size="mini" @click="gopage(scope.row)">详情</el-button>
-                </template>
-              </el-table-column>
-              <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center"></el-table-column>
-              <el-table-column prop="CustomerName" sortable min-width="90" label="委托方名称" align="center"></el-table-column>
-              <el-table-column prop="TestDetail" sortable min-width="100" label="检测项目" align="center"></el-table-column>
-              <el-table-column prop="CheckStatus" sortable min-width="90" label="代办工作" align="center">
-                <template slot-scope="scope">
-                  <el-tag size="small" v-show="scope.row.CheckStatus=='0'" type="danger">数据录入</el-tag>
-                  <el-tag size="small" v-show="scope.row.CheckStatus=='1'" type="success">数据校核</el-tag>
-                  <el-tag size="small" v-show="scope.row.CheckStatus=='2'" type="info">数据审批</el-tag>
-                  <el-tag size="small" v-show="scope.row.ReportStatus=='4'" type="warning">报告签发</el-tag>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-card>
-        </el-col>
+          <el-form ref="form" :inline="true" style="float: left; margin-left:20px;">
+            <el-form-item>
+              <router-link :to="'/lims/dataentry/tacktodo'">
+                <el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.entry]">
+                  数据录入
+                  <span style="color:#0000FF">【{{usertotal.EntryTotal}}】</span>
+                </el-button>
+              </router-link>
+            </el-form-item>
+            <el-form-item>
+              <router-link :to="'/lims/dataentry/tacktodo'">
+                <el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.check]">
+                  数据校核
+                  <span style="color:#0000FF">【{{usertotal.CheckTotal}}】</span>
+                </el-button>
+              </router-link>
+            </el-form-item>
+            <el-form-item>
+              <router-link :to="'/lims/dataentry/tacktodo'">
+                <el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.audit]">
+                  数据审批
+                  <span style="color:#0000FF">【{{usertotal.AuditTotal}}】</span>
+                </el-button>
+              </router-link>
+            </el-form-item>
+            <el-form-item>
+              <router-link :to="'/lims/createreport/reporttodo'">
+                <el-button type="primary" plain style="margin-left:5px;" size="mini" v-if="!allshow && permissions[permissionscode.sign]">
+                  报告签发
+                  <span style="color:#0000FF">【{{usertotal.SignTotal}}】</span>
+                </el-button>
+              </router-link>
+            </el-form-item>
+          </el-form>
+        </el-card>
 
-        <el-col :span="12">
-          <el-card class="box-card" style="height: calc(100vh - 350px);" v-if="!allshow">
-            <div slot="header">
-              <legend style="color:#436EEE"></legend>
-              <i class="icon icon-database"> 已办工作</i>
-            </div>
-            <el-table :data="DoneData" size="small" border height="calc(100vh - 470px)">
-              <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center"></el-table-column>
-              <el-table-column prop="CustomerName" sortable min-width="100" label="委托方名称" align="center"></el-table-column>
-              <el-table-column prop="TestDetail" sortable min-width="100" label="检测项目" align="center"></el-table-column>
-              <el-table-column prop="CheckStatus" sortable min-width="100" label="已办工作" align="center">
-                <template slot-scope="scope">
-                  <el-tag size="small" v-show="scope.row.CreateUserId == user.id&&scope.row.CheckStatus=='1'" type="danger">数据录入</el-tag>
-                  <el-tag size="small" v-show="scope.row.JHUserId == user.id&&(scope.row.CheckStatus=='2'||scope.row.CheckStatus=='3')"
-                    type="success">数据校核</el-tag>
-                  <el-tag size="small" v-show="scope.row.CheckUserId == user.id&&(scope.row.CheckStatus=='4'||scope.row.CheckStatus=='5')"
-                    type="info">数据审批</el-tag>
-                  <el-tag size="small" v-show="scope.row.ReportStatus != '0'" type="warning">报告签发</el-tag>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-card>
-        </el-col>
-      </el-row>
+        <el-row :gutter="5">
+          <el-col :span="12">
+            <el-card class="box-card" style="height: calc(100vh - 350px);" v-if="!allshow">
+              <div slot="header">
+                <legend style="color:#436EEE"></legend>
+                <i class="icon icon-database"> 待办工作</i>
+              </div>
+              <el-table :data="WaitData" size="small" border height="calc(100vh - 470px)">
+                <el-table-column label="待办工作跳转" width="100" align="center" fixed>
+                  <template slot-scope="scope">
+                    <el-button type="primary" plain size="mini" @click="gopage(scope.row)">详情</el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center"></el-table-column>
+                <el-table-column prop="CustomerName" sortable min-width="90" label="委托方名称" align="center"></el-table-column>
+                <el-table-column prop="TestDetail" sortable min-width="100" label="检测项目" align="center"></el-table-column>
+                <el-table-column prop="CheckStatus" sortable min-width="90" label="代办工作" align="center">
+                  <template slot-scope="scope">
+                    <el-tag size="small" v-show="scope.row.CheckStatus=='0'" type="danger">数据录入</el-tag>
+                    <el-tag size="small" v-show="scope.row.CheckStatus=='1'" type="success">数据校核</el-tag>
+                    <el-tag size="small" v-show="scope.row.CheckStatus=='2'" type="info">数据审批</el-tag>
+                    <el-tag size="small" v-show="scope.row.ReportStatus=='4'" type="warning">报告签发</el-tag>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </el-col>
 
-      <el-row>
-        <el-card style="margin-top: 5px; height:460.5px; width: 100%">
-          <div class="salesCard">
-            <el-col :span="16" style="margin-top: -10px">
-              <el-tabs size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-                <el-tab-pane label="检测任务">
-                  <div v-if="EntrustX.length === 0">无显示数据,可在
-                    <router-link :to="'/lims/tasksentrust/addentrust/operation'">检测任务</router-link> 中录入</div>
-                  <div id="Entrustid" style="height:380px; margin-left:-25px; margin-top:-10px; min-width:400px; width: 900px"></div>
-                </el-tab-pane>
-                <el-tab-pane label="数据录入">
-                  <div v-if="DataEntryX.length === 0">无显示数据,可在
-                    <router-link :to="'/lims/dataentry/tacktodo'">数据录入</router-link> 中录入</div>
-                  <div id="Dataentryid" style="height:380px; margin-left:-25px; margin-top:-10px; min-width:400px; width: 900px"></div>
-                </el-tab-pane>
-              </el-tabs>
-            </el-col>
-            <el-col :span="8" style="float: right; margin-top: -10px">
-              <div v-if="ProjectList.length === 0">无显示数据</div>
-              <ranking-list title="检测报告" :list="ProjectList" />
-            </el-col>
-          </div>
-        </el-card>
-      </el-row>
+          <el-col :span="12">
+            <el-card class="box-card" style="height: calc(100vh - 350px);" v-if="!allshow">
+              <div slot="header">
+                <legend style="color:#436EEE"></legend>
+                <i class="icon icon-database"> 已办工作</i>
+              </div>
+              <el-table :data="DoneData" size="small" border height="calc(100vh - 470px)">
+                <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center"></el-table-column>
+                <el-table-column prop="CustomerName" sortable min-width="100" label="委托方名称" align="center"></el-table-column>
+                <el-table-column prop="TestDetail" sortable min-width="100" label="检测项目" align="center"></el-table-column>
+                <el-table-column prop="CheckStatus" sortable min-width="100" label="已办工作" align="center">
+                  <template slot-scope="scope">
+                    <el-tag size="small" v-show="scope.row.CreateUserId == user.id&&scope.row.CheckStatus=='1'" type="danger">数据录入</el-tag>
+                    <el-tag size="small" v-show="scope.row.JHUserId == user.id&&(scope.row.CheckStatus=='2'||scope.row.CheckStatus=='3')"
+                            type="success">数据校核</el-tag>
+                    <el-tag size="small" v-show="scope.row.CheckUserId == user.id&&(scope.row.CheckStatus=='4'||scope.row.CheckStatus=='5')"
+                            type="info">数据审批</el-tag>
+                    <el-tag size="small" v-show="scope.row.ReportStatus != '0'" type="warning">报告签发</el-tag>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="5">
-        <el-col :span="12">
-          <el-card :bordered="false" style="margin-top: 5px">
-            <div slot="header">
-              <legend style="color:#436EEE"></legend>
-              <i class="icon icon-database"> 设备使用记录统计</i>
+        <el-row>
+          <el-card style="margin-top: 5px; height:460.5px; width: 100%">
+            <div class="salesCard">
+              <el-col :span="16" style="margin-top: -10px">
+                <el-tabs size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
+                  <el-tab-pane label="检测任务">
+                    <div v-if="EntrustX.length === 0">无显示数据,可在
+                      <router-link :to="'/lims/tasksentrust/addentrust/operation'">检测任务</router-link> 中录入</div>
+                    <div id="Entrustid" style="height:380px; margin-left:-25px; margin-top:-10px; min-width:400px; width: 900px"></div>
+                  </el-tab-pane>
+                  <el-tab-pane label="数据录入">
+                    <div v-if="DataEntryX.length === 0">无显示数据,可在
+                      <router-link :to="'/lims/dataentry/tacktodo'">数据录入</router-link> 中录入</div>
+                    <div id="Dataentryid" style="height:380px; margin-left:-25px; margin-top:-10px; min-width:400px; width: 900px"></div>
+                  </el-tab-pane>
+                </el-tabs>
+              </el-col>
+              <el-col :span="8" style="float: right; margin-top: -10px">
+                <div v-if="ProjectList.length === 0">无显示数据</div>
+                <ranking-list title="检测报告" :list="ProjectList" />
+              </el-col>
             </div>
-            <div v-if="InstrumentX.length === 0">无显示数据</div>
-            <div id="Instrumentid" style="height:366.5px; min-width:400px; width: 100%"></div>
           </el-card>
-        </el-col>
+        </el-row>
 
-        <el-col :span="12">
-          <el-card :bordered="false" style="margin-top: 5px">
-            <div slot="header">
-              <legend style="color:#436EEE"></legend>
-              <i class="icon icon-database"> 委托方统计</i>
-            </div>
-            <div v-if="CustomerTitle.length === 0">无显示数据</div>
-            <div id="Customerid" style="width:100%; height:366.5px;"></div>
-          </el-card>
-        </el-col>
-      </el-row>
+        <el-row :gutter="5">
+          <el-col :span="12">
+            <el-card :bordered="false" style="margin-top: 5px">
+              <div slot="header">
+                <legend style="color:#436EEE"></legend>
+                <i class="icon icon-database"> 设备使用记录统计</i>
+              </div>
+              <div v-if="InstrumentX.length === 0">无显示数据</div>
+              <div id="Instrumentid" style="height:366.5px; min-width:400px; width: 100%"></div>
+            </el-card>
+          </el-col>
+
+          <el-col :span="12">
+            <el-card :bordered="false" style="margin-top: 5px">
+              <div slot="header">
+                <legend style="color:#436EEE"></legend>
+                <i class="icon icon-database"> 委托方统计</i>
+              </div>
+              <div v-if="CustomerTitle.length === 0">无显示数据</div>
+              <div id="Customerid" style="width:100%; height:366.5px;"></div>
+            </el-card>
+          </el-col>
+        </el-row>
+      </div>
     </div>
-  </div>
+  </no-ssr>
 </template>
 
 <script>
@@ -175,7 +177,7 @@
   import Bar from '../components/chart/Bar'
   import RankingList from '../components/chart/RankingList'
   import Trend from '../components/chart/Trend'
-  import docTemplateApi from '@/api/lims/docTemplate';
+  import docTemplateApi from '@/api/lims/docTemplate'
   import SalesData from '../components/chart/SalesData'
 
   export default {

+ 3 - 1
src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/datalist.vue

@@ -1452,7 +1452,9 @@
         api.getList('', params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
-          this.$refs['DataoperaCompoment'].entityList = this.entityList
+          if (process.client) {
+            this.$refs['DataoperaCompoment'].entityList = this.entityList
+          }
           if (res.data.startIndex) {
             this.MaxOrderNo = res.data.startIndex
           }

+ 145 - 139
src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/datamain.vue

@@ -1,144 +1,149 @@
 <template>
-  <el-collapse accordion v-model="activeName">
-    <el-collapse-item name="1">
-      <template slot="title">
-        <i class="header-icon el-icon-info"></i> 主数据
-      </template>
-      <el-form label-width="120px" ref="EntityForm" :model="formData">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="委托单位">
-              <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp" filterable
-                         placeholder="请选择" style="width: 100%">
-                <el-option
-                  v-for="item in EntrustCorpOptions"
-                  :key="item.Id"
-                  :label="item.CustomerName"
-                  :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检测地点" required>
-              <el-select ref="selectPositionCheck" v-model="formData.PositionCheckId" filterable placeholder="请选择"
-                         style="width: 70%" default-first-option @change="changPositionCheck"
-                         :filter-method="positionCheckFilter" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
-                <el-option
-                  v-for="item in PositionCheckOptions"
-                  :key="item.Id"
-                  :label="item.PositionName"
-                  :value="item.Id">
-                </el-option>
-              </el-select>
-              <template>
-                <el-popover
-                  placement="left"
-                  title="添加检测地点"
-                  width="200"
-                  trigger="click">
-                  <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
-                  <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                  <el-button slot="reference" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3"><i class="el-icon-plus"></i>
-                  </el-button>
-                </el-popover>
-              </template>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检测日期">
-              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date"
-                              placeholder="请选择检测日期" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="环境温度">
-              <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
-                <template slot="append">℃</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="依据标准及代号" label-width="130px">
-              <el-cascader style="width: 100%"
-                           :options="StandardTreeOptions"
-                           :props="props"
-                           v-model="selectedOptions"
-                           @change="handleChange"
-                           :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="描述">
-              <el-input v-model="formData.StandardDesc" placeholder="请输入" style="width: 100%" :disabled="Descdisabled || DataStatus != 0 && DataStatus != 5 && DataStatus != 3"></el-input>
-            </el-form-item>
-          </el-col>
-          <!--<el-col :span="24">
-            <div
-              style="width: 100%; height: 1px; background-color: #d3d4d6; border: none; margin-bottom: 15px; margin-top: -10px;">
-              <span style="font-weight: bold; color: #1D8CE0;">检测仪器及编号 </span>
-            </div>
-          </el-col>-->
-          <el-col :span="24">
-            <el-row >
-              <el-col :span="8">
-                <el-form-item label="安全附件检测仪" label-width="140px" required>
-                  <el-select ref="selectStatus" v-model="formData.Instrument1" filterable placeholder="安全附件检测仪"
-                             style="width: 100%" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3" @change="changeInstrument">
-                    <el-option
-                      v-for="item in SafAccDetectorOptions"
-                      :key="item.Id"
-                      :value="item.Code">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="热式气体质量流量计" label-width="200px" required>
-                  <el-select ref="selectStatus" v-model="formData.Instrument2" filterable placeholder="热式气体质量流量计"
-                             style="width: 100%" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
-                    <el-option
-                      v-for="item in GasFlowMeterOptions"
-                      :key="item.Id"
-                      :value="item.Code">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="压力变送器" required>
-                  <el-select ref="selectStatus" v-model="formData.Instrument3" filterable placeholder="差压变送器"
-                             style="width: 100%" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
-                    <el-option
-                      v-for="item in DifPressTranOptions"
-                      :key="item.Id"
-                      :value="item.Code">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
+  <no-ssr>
+    <el-collapse accordion v-model="activeName">
+      <el-collapse-item name="1">
+        <template slot="title">
+          <i class="header-icon el-icon-info"></i> 主数据
+        </template>
+        <el-form label-width="120px" ref="EntityForm" :model="formData">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="委托单位">
+                <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp" filterable
+                           placeholder="请选择" style="width: 100%">
+                  <el-option
+                    v-for="item in EntrustCorpOptions"
+                    :key="item.Id"
+                    :label="item.CustomerName"
+                    :value="item.Id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检测地点" required>
+                <el-select ref="selectPositionCheck" v-model="formData.PositionCheckId" filterable placeholder="请选择"
+                           style="width: 70%" default-first-option @change="changPositionCheck"
+                           :filter-method="positionCheckFilter" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
+                  <el-option
+                    v-for="item in PositionCheckOptions"
+                    :key="item.Id"
+                    :label="item.PositionName"
+                    :value="item.Id">
+                  </el-option>
+                </el-select>
+                <template>
+                  <el-popover
+                    placement="left"
+                    title="添加检测地点"
+                    width="200"
+                    trigger="click">
+                    <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
+                    <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
+                    <el-button slot="reference" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3"><i class="el-icon-plus"></i>
+                    </el-button>
+                  </el-popover>
+                </template>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检测日期">
+                <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date"
+                                placeholder="请选择检测日期" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
 
-              <el-col :span="24" align="center">
-                <el-button type="primary" size="mini" @click="saveMainInfo" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">保存</el-button>
-                <el-button type="primary" size="mini" @click="getDataHistory" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">选择历史记录</el-button>
-              </el-col>
+            <el-col :span="8">
+              <el-form-item label="环境温度">
+                <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
+                  <template slot="append">℃</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="依据标准及代号" label-width="130px">
+                <el-cascader style="width: 100%"
+                             :options="StandardTreeOptions"
+                             :props="props"
+                             v-model="selectedOptions"
+                             @change="handleChange"
+                             :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="描述">
+                <el-input v-model="formData.StandardDesc" placeholder="请输入" style="width: 100%" :disabled="Descdisabled || DataStatus != 0 && DataStatus != 5 && DataStatus != 3"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <!--<el-col :span="24">
+              <div
+                style="width: 100%; height: 1px; background-color: #d3d4d6; border: none; margin-bottom: 15px; margin-top: -10px;">
+                <span style="font-weight: bold; color: #1D8CE0;">检测仪器及编号 </span>
+              </div>
+            </el-col>-->
+            <el-col :span="24">
+              <el-row >
+                <el-col :span="8">
+                  <el-form-item label="安全附件检测仪" label-width="140px" required>
+                    <el-select ref="selectStatus" v-model="formData.Instrument1" filterable placeholder="安全附件检测仪"
+                               style="width: 100%" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3" @change="changeInstrument">
+                      <el-option
+                        v-for="item in SafAccDetectorOptions"
+                        :key="item.Id"
+                        :value="item.Code">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="热式气体质量流量计" label-width="200px" required>
+                    <el-select ref="selectStatus" v-model="formData.Instrument2" filterable placeholder="热式气体质量流量计"
+                               style="width: 100%" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
+                      <el-option
+                        v-for="item in GasFlowMeterOptions"
+                        :key="item.Id"
+                        :value="item.Code">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="压力变送器" required>
+                    <el-select ref="selectStatus" v-model="formData.Instrument3" filterable placeholder="差压变送器"
+                               style="width: 100%" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">
+                      <el-option
+                        v-for="item in DifPressTranOptions"
+                        :key="item.Id"
+                        :value="item.Code">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
 
-            </el-row>
-          </el-col>
+                <el-col :span="24" align="center">
+                  <el-button type="primary" size="mini" @click="saveMainInfo" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">保存</el-button>
+                  <el-button type="primary" size="mini" @click="getDataHistory" :disabled="DataStatus != 0 && DataStatus != 5 && DataStatus != 3">选择历史记录</el-button>
+                </el-col>
 
-        </el-row>
-      </el-form>
-      <data-history ref="DataoperaCompoment" @init-datalist="initDatalist"></data-history>
-    </el-collapse-item>
-    <el-collapse-item name="2">
-      <template slot="title">
-        <i class="el-icon-upload"></i> 附件列表
-      </template>
-      <attach-list></attach-list>
-    </el-collapse-item>
-  </el-collapse>
+              </el-row>
+            </el-col>
+
+          </el-row>
+        </el-form>
+        <data-history ref="DataoperaCompoment" @init-datalist="initDatalist"></data-history>
+      </el-collapse-item>
+      <el-collapse-item name="2">
+        <template slot="title">
+          <i class="el-icon-upload"></i> 附件列表
+        </template>
+        <attach-list></attach-list>
+      </el-collapse-item>
+    </el-collapse>
+  </no-ssr>
 </template>
 <script>
   import { mapGetters } from 'vuex'
@@ -288,8 +293,9 @@
           this.InspecCorpOptions = res.data.items['EntrustCorp']
           this.StatusOptions = res.data.items['ProductStatus']
           this.StandardItemsOptions = res.data.items['StandardItems']
-          this.StandardTreeOptions = window.toolfun_gettreejson(this.StandardItemsOptions, 'Id', 'ParentId',
-            'Id,ItemId,ParentId,ItemName,ItemCode,ItemValue')
+          if (process.client) {
+            this.StandardTreeOptions = window.toolfun_gettreejson(this.StandardItemsOptions, 'Id', 'ParentId', 'Id,ItemId,ParentId,ItemName,ItemCode,ItemValue')
+          }
 
           if (res.data.items['DefaultStandardHxf']) {
             this.selectedOptions = res.data.items['DefaultStandardHxf'].split(',')

+ 35 - 3
src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/dataopera.vue

@@ -10,7 +10,7 @@
           明细项目
         </span>
       </div>-->
-      <el-form label-width="80px" ref="EntityForm" :model="formData">
+      <el-form label-width="100px" ref="EntityForm" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item prop="OrderNo" label="序号" :rules="[{ required: true, message: '序号不能为空'}]">
@@ -92,6 +92,35 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="存储介质">
+              <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%">
+                <template slot="append">℃</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="压力分级">
+              <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%">
+                <template slot="append">℃</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="正开启压力">
+              <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%">
+                <template slot="append">℃</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="负开启压力">
+              <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%">
+                <template slot="append">℃</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8">
             <el-form-item prop="Status" label="产品状态" :rules="[{ required: true, message: '产品状态不能为空'}]">
               <el-select ref="selectStatus" v-model="formData.Status" placeholder="请选择"
@@ -118,6 +147,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+
         </el-row>
       </el-form>
 
@@ -1521,8 +1551,10 @@
           this.InspecCorpOptions = res.data.items['EntrustCorp']
           this.StatusOptions = res.data.items['ProductStatus']
           this.StandardItemsOptions = res.data.items['StandardItems']
-          this.StandardTreeOptions = window.toolfun_gettreejson(this.StandardItemsOptions, 'Id', 'ParentId',
-            'Id,ItemId,ParentId,ItemName,ItemCode,ItemValue')
+          if (process.client) {
+            this.StandardTreeOptions = window.toolfun_gettreejson(this.StandardItemsOptions, 'Id', 'ParentId',
+              'Id,ItemId,ParentId,ItemName,ItemCode,ItemValue')
+          }
           this.selectedOptions = res.data.items['DefaultStandardHxf'].split(',')
           this.formData.DetectBasis = res.data.items['DefaultStandardHxf']
           this.ProblemOptions = res.data.items['ProblemItems']