zc

README.md

@@ -107,7 +107,7 @@
 | type == 5 | 实验室详情 | 后端生成 |
 | type == 3 | 危险源列表 | 后端生成 |
 | type == 2 | 安全制度 | 后端生成 |
-| type == 1 | MSDS说明书 | 后端生成 |
+| type == 1 | MSDS说明书 | 前端端生成 |
 
     
 ## 五.版本相关

src/api/chemicalManage/index.js

@@ -45,3 +45,20 @@ export function chemicalMsdsDetail(query) {
   })
 }
 
+//化学品基础配置
+export function chemicalBasicConfigList(query) {
+  return request({
+    url: '/chemical/basicConfig/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//化学品基础配置提交
+export function chemicalBasicConfigAdd(data) {
+  return request({
+    url: '/chemical/basicConfig/add',
+    method: 'post',
+    data: data
+  })
+}

src/views/chemicalManage/basicManagement/basicConfig/index.vue

@@ -11,42 +11,42 @@
         <div class="page-top-box">
           <div class="page-min-left-box">
             <div>
-              <el-form-item label="化学品申购：" prop="data1" class="page-switch">
+              <el-form-item label="化学品申购：" prop="subscribe" class="page-switch">
                 <el-switch
                   :active-value="true"
                   :inactive-value="false"
                   active-color="#0183FA"
                   inactive-color="#999"
-                  v-model="configForm.data1"
+                  v-model="configForm.subscribe"
                   active-text="启用"
                   inactive-text="停用"
                 ></el-switch>
               </el-form-item>
             </div>
             <div>
-              <el-form-item label="终端登录：" prop="data2">
-                <el-checkbox-group v-model="configForm.data2">
-                  <el-checkbox :label="1">人脸</el-checkbox>
-                  <el-checkbox :label="2">刷卡</el-checkbox>
-                  <el-checkbox :label="3">扫码</el-checkbox>
-                  <el-checkbox :label="4">人脸+刷卡</el-checkbox>
+              <el-form-item label="终端登录：" prop="loginType">
+                <el-checkbox-group v-model="configForm.loginType">
+                  <el-checkbox label="1">人脸</el-checkbox>
+                  <el-checkbox label="2">刷卡</el-checkbox>
+                  <el-checkbox label="3">扫码</el-checkbox>
+                  <el-checkbox label="4">人脸+刷卡</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </div>
             <div>
-              <el-form-item label="双人验证方式：" prop="data3">
-                <el-checkbox-group v-model="configForm.data3">
-                  <el-checkbox :label="1">人脸</el-checkbox>
-                  <el-checkbox :label="2">刷卡</el-checkbox>
-                  <el-checkbox :label="3">扫码</el-checkbox>
+              <el-form-item label="双人验证方式：" prop="verifyType">
+                <el-checkbox-group v-model="configForm.verifyType">
+                  <el-checkbox label="1">人脸</el-checkbox>
+                  <el-checkbox label="2">刷卡</el-checkbox>
+                  <el-checkbox label="3">扫码</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </div>
           </div>
           <div class="page-min-right-box">
             <div>
-              <el-form-item label="超时入库：" prop="data4" class="border-right-radius-form-item">
-                <el-input-number v-model="configForm.data4" style="width:80px;"
+              <el-form-item label="超时入库：" prop="timeoutHour" class="border-right-radius-form-item">
+                <el-input-number v-model="configForm.timeoutHour" style="width:90px;"
                                  :controls="false" :min="1" :max="168">
                 </el-input-number>
               </el-form-item>
@@ -54,17 +54,18 @@
               <p class="text-p">待入库化学品操作入库时间规定</p>
             </div>
             <div>
-              <el-form-item label="称重容差百分比：" prop="data5" class="border-right-radius-form-item">
-                <el-input-number v-model="configForm.data5" style="width:80px;"
-                                 :controls="false" :min="1" :max="1000">
+              <el-form-item label="称重容差百分比：" prop="vinVex" class="border-right-radius-form-item">
+                <el-input-number v-model="configForm.vinVex" style="width:90px;"
+                                 :precision="2" :step="0.1"
+                                 :controls="false" :min="0.01" :max="20">
                 </el-input-number>
               </el-form-item>
               <p class="time-p">%</p>
               <p class="text-p">业务操作称重时，化学品当前净含量的容差占比</p>
             </div>
             <div>
-              <el-form-item label="超时未归还：" prop="data6" class="border-right-radius-form-item">
-                <el-input-number v-model="configForm.data6" style="width:80px;"
+              <el-form-item label="超时未归还：" prop="useHour" class="border-right-radius-form-item">
+                <el-input-number v-model="configForm.useHour" style="width:90px;"
                                  :controls="false" :min="1" :max="168">
                 </el-input-number>
               </el-form-item>
@@ -72,8 +73,8 @@
               <p class="text-p">化学品领用后，使用最大时长</p>
             </div>
             <div>
-              <el-form-item label="超时操作：" prop="data7" class="border-right-radius-form-item">
-                <el-input-number v-model="configForm.data7" style="width:80px;"
+              <el-form-item label="超时操作：" prop="operateTimeout" class="border-right-radius-form-item">
+                <el-input-number v-model="configForm.operateTimeout" style="width:90px;"
                                  :controls="false" :min="1" :max="240">
                 </el-input-number>
               </el-form-item>
@@ -85,79 +86,81 @@
         <div class="page-bottom-box">
           <p class="min-title">管控配置</p>
           <div class="page-bottom-table-box">
-            <p :class="checkType==1?'check-button':''" @click="checkButton(1)">管控类</p>
-            <p :class="checkType==2?'check-button':''" @click="checkButton(2)">非管控类</p>
+            <p :class="checkType?'check-button':''" @click="checkButton(true)">管控类</p>
+            <p :class="!checkType?'check-button':''" @click="checkButton(false)">非管控类</p>
           </div>
-          <div>
-            <el-form-item label="双人认证" prop="data8" class="page-switch" label-width="70px">
-              <el-switch
-                :active-value="true"
-                :inactive-value="false"
-                active-color="#0183FA"
-                inactive-color="#999"
-                v-model="configForm.data8"
-                active-text="启用"
-                inactive-text="停用"
-              ></el-switch>
-            </el-form-item>
-            <el-form-item label="二维码打印" prop="data9" class="page-switch">
-              <el-switch
-                :active-value="true"
-                :inactive-value="false"
-                active-color="#0183FA"
-                inactive-color="#999"
-                v-model="configForm.data9"
-                active-text="启用"
-                inactive-text="停用"
-              ></el-switch>
-            </el-form-item>
-            <el-form-item label="领用称重" prop="data10" class="page-switch">
-              <el-switch
-                :active-value="true"
-                :inactive-value="false"
-                active-color="#0183FA"
-                inactive-color="#999"
-                v-model="configForm.data10"
-                active-text="启用"
-                inactive-text="停用"
-              ></el-switch>
-            </el-form-item>
-            <el-form-item label="手动录入重量" prop="data11" class="page-switch">
-              <el-switch
-                :active-value="true"
-                :inactive-value="false"
-                active-color="#0183FA"
-                inactive-color="#999"
-                v-model="configForm.data11"
-                active-text="启用"
-                inactive-text="停用"
-              ></el-switch>
-            </el-form-item>
-            <el-form-item label="" prop="data12" style="margin:2px 0 0 20px;">
-              <el-checkbox-group v-model="configForm.data12">
-                <el-checkbox :label="1">仅量程外</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </div>
-          <div style="margin-top:5px;">
-            <el-form-item label="实验室存放规定：" prop="data13">
-              <div class="border-radius-form-item">
-                <p class="text-p">液体总量</p>
-                <el-input-number v-model="configForm.data13" style="width:80px;"
-                                 :controls="false" :min="1" :max="240">
-                </el-input-number>
-                <p class="time-p">L</p>
-              </div>
-            </el-form-item>
-            <el-form-item label="" prop="data14" style="margin-left:50px;">
-              <div class="border-radius-form-item">
-                <p class="text-p">固体总量</p>
-                <el-input-number v-model="configForm.data14" style="width:80px;"
-                                 :controls="false" :min="1" :max="240">
-                </el-input-number>
-                <p class="time-p">KG</p>
-              </div>
-            </el-form-item>
+          <div v-for="(item,index) in configForm.controllist" :key="index">
+            <div v-if="item.controlType == checkType">
+              <el-form-item label="双人认证" prop="verify" class="page-switch" label-width="70px">
+                <el-switch
+                  :active-value="true"
+                  :inactive-value="false"
+                  active-color="#0183FA"
+                  inactive-color="#999"
+                  v-model="item.verify"
+                  active-text="启用"
+                  inactive-text="停用"
+                ></el-switch>
+              </el-form-item>
+              <el-form-item label="二维码打印" prop="qrCodePrint" class="page-switch">
+                <el-switch
+                  :active-value="true"
+                  :inactive-value="false"
+                  active-color="#0183FA"
+                  inactive-color="#999"
+                  v-model="item.qrCodePrint"
+                  active-text="启用"
+                  inactive-text="停用"
+                ></el-switch>
+              </el-form-item>
+              <el-form-item label="领用称重" prop="metage" class="page-switch">
+                <el-switch
+                  :active-value="true"
+                  :inactive-value="false"
+                  active-color="#0183FA"
+                  inactive-color="#999"
+                  v-model="item.metage"
+                  active-text="启用"
+                  inactive-text="停用"
+                ></el-switch>
+              </el-form-item>
+              <el-form-item label="手动录入重量" prop="inputWeight" class="page-switch">
+                <el-switch
+                  :active-value="true"
+                  :inactive-value="false"
+                  active-color="#0183FA"
+                  inactive-color="#999"
+                  v-model="item.inputWeight"
+                  active-text="启用"
+                  inactive-text="停用"
+                ></el-switch>
+              </el-form-item>
+              <el-form-item label="" prop="outRange" style="margin:2px 0 0 20px;">
+                <el-checkbox-group v-model="item.outRange">
+                  <el-checkbox :label="true">仅量程外</el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </div>
+            <div style="margin-top:5px;" v-if="item.controlType == checkType">
+              <el-form-item label="实验室存放规定：" prop="fluidMax">
+                <div class="border-radius-form-item">
+                  <p class="text-p">液体总量</p>
+                  <el-input-number v-model="item.fluidMax" style="width:80px;"
+                                   :controls="false" :min="1" :max="240">
+                  </el-input-number>
+                  <p class="time-p">L</p>
+                </div>
+              </el-form-item>
+              <el-form-item label="" prop="solidMax" style="margin-left:50px;">
+                <div class="border-radius-form-item">
+                  <p class="text-p">固体总量</p>
+                  <el-input-number v-model="item.solidMax" style="width:80px;"
+                                   :controls="false" :min="1" :max="240">
+                  </el-input-number>
+                  <p class="time-p">KG</p>
+                </div>
+              </el-form-item>
+            </div>
           </div>
         </div>
       </el-form>
@@ -165,42 +168,21 @@
   </div>
 </template>
 <script>
-  //import { getDicts } from "@/api/commonality/noPermission";
-  //import { systemUserSelect } from "@/api/commonality/permission";
-  //import { getInfo } from "@/api/basicsModules/index";
-  //import addPage from "./addPage.vue";
+  import { chemicalBasicConfigList,chemicalBasicConfigAdd } from "@/api/chemicalManage/index";
   export default {
     name: 'index',
-    //components: {
-    //  addPage
-    //},
     data () {
       return {
-        checkType:1,
-        configForm:{
-          data1:null,
-          data2:[],
-          data3:[],
-          data4:null,
-          data5:null,
-          data6:null,
-          data7:null,
-          data8:null,
-          data9:null,
-          data10:null,
-          data11:null,
-          data12:[],
-          data13:null,
-          data14:null,
-        },
+        checkType:true,
+        configForm:{},
         configRules:{
-          data1: [
-            { required: true, message: "", trigger: "blur" },
-            { required: true, message: "", validator: this.spaceJudgment, trigger: "blur" }
+          loginType: [
+            { required: true, message: "请选择终端登录方式", trigger: "blur" },
+            { required: true, message: "请选择终端登录方式", validator: this.spaceJudgment, trigger: "blur" }
           ],
-          data2: [
-            { required: true, message: "", trigger: "blur" },
-            { required: true, message: "", validator: this.spaceJudgment, trigger: "blur" }
+          verifyType: [
+            { required: true, message: "请选择双人认证方式", trigger: "blur" },
+            { required: true, message: "请选择双人认证方式", validator: this.spaceJudgment, trigger: "blur" }
           ],
         },
       }
@@ -209,9 +191,16 @@
 
     },
     mounted () {
-      //this.getList();
+      this.chemicalBasicConfigList();
     },
     methods: {
+      chemicalBasicConfigList(){
+        chemicalBasicConfigList({}).then(response => {
+          let obj = response.data.basic[0];
+          obj.controllist = response.data.contro;
+          this.$set(this,'configForm',obj);
+        });
+      },
       //切换
       checkButton(type){
         if(type != this.checkType){
@@ -220,7 +209,14 @@
       },
       //提交
       submitButton(){
-
+        this.$refs["configForm"].validate(valid => {
+          if (valid) {
+            chemicalBasicConfigAdd(this.configForm).then(response => {
+              this.msgSuccess(response.message);
+              this.chemicalBasicConfigList();
+            });
+          }
+        })
       },
     },
   }