Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

package.json

@@ -36,6 +36,7 @@
     "fuse.js": "3.4.4",
     "js-beautify": "^1.10.2",
     "js-cookie": "2.2.0",
+    "js-md5": "^0.8.3",
     "jsencrypt": "^3.0.0-rc.1",
     "jszip": "^3.7.1",
     "material-components-vue": "^1.2.0",

src/views/invoicing/consumable/information.vue

@@ -106,22 +106,42 @@
         <el-form-item label="单位" prop="conUnit" v-if="dialogtitle == '添加'">
           <el-input v-model="ruleForm.conUnit" placeholder="请输入单位"></el-input>
         </el-form-item>
-        <el-form-item label="耗材类型" prop="conNames" v-if="dialogtitle == '添加'">
+        <el-form-item label="耗材类型" prop="conTypeId" v-if="dialogtitle == '添加'">
-          <el-input v-model="ruleForm.conNames" placeholder="请输耗材信息名称" disabled></el-input>
+          <el-select v-model="ruleForm.conTypeId" placeholder="请选择">
-        </el-form-item>
+            <el-option v-for="item in this.tableData.data" :key="item.conTypeId" :label="item.conTypeName" :value="item.id">
-        <el-form-item v-if="dialogtitle == '添加'">
+            </el-option>
-          <el-button type="primary" @click="typedialogshow = true">去选择</el-button>
+          </el-select>
+
         </el-form-item>
+        <!-- <el-form-item
+          label="耗材类型"
+          prop="conNames"
+          v-if="dialogtitle == '添加'"
+        >
+          <el-input
+            v-model="ruleForm.conNames"
+            placeholder="请输耗材信息名称"
+            disabled
+          ></el-input>
+        </el-form-item>-->
+        <!-- <el-form-item v-if="dialogtitle == '添加'">
+          <el-button type="primary" @click="typedialogshow = true"
+            >去选择</el-button
+          >
+        </el-form-item>  -->
         <el-form-item label="耗材信息名称" prop="conName">
           <el-input v-model="ruleForm.conName" placeholder="请输入耗材信息名称"></el-input>
         </el-form-item>
-        <el-form-item label="耗材信息代码" prop="conCode">
+        <!-- <el-form-item label="耗材信息代码" prop="conCode">
-          <el-input v-model="ruleForm.conCode" placeholder="请输入耗材信息代码"></el-input>
+          <el-input
-        </el-form-item>
+            v-model="ruleForm.conCode"
-        <el-form-item label="耗材价格" prop="price">
+            placeholder="请输入耗材信息代码"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="耗材价格">
           <el-input v-model="ruleForm.price" placeholder="请输入耗材价格"></el-input>
         </el-form-item>
-        <el-form-item label="预警值" prop="conWarning">
+        <el-form-item label="预警值">
           <el-input v-model="ruleForm.conWarning" placeholder="请输入耗材预警值"></el-input>
         </el-form-item>
         <!-- <el-form-item label="单位耗材值" prop="surplusStock">
@@ -129,7 +149,7 @@
         </el-form-item> -->
         <el-form-item style="display: flex;justify-content: flex-end;">
           <el-button @click="dialogshow = false">取 消</el-button>
-          <el-button type="primary" :loading="ruleFormLoading" @click="submitForm('refruleForm')">
+          <el-button type="primary" @click="submitForm('refruleForm')">
             确 定
           </el-button>
         </el-form-item>
@@ -296,11 +316,11 @@ export default {
         conCode: "",
         conName: "",
         conTypeId: "",
-        price: "",
+        price: "0",
         conNames: "",
         // surplusStock: '',
         conUnit: "",
-        conWarning: "",
+        conWarning: "999",
         shopId: localStorage.getItem("shopId")
       },
       rules: {
@@ -310,7 +330,7 @@ export default {
         conName: [
           { required: true, message: "请输入耗材信息名称", trigger: "blur" }
         ],
-        conNames: [
+        conTypeId: [
           { required: true, message: "请选择耗材类型", trigger: "blur" }
         ],
         price: [{ required: true, message: "请输入耗材价格", trigger: "blur" }],
@@ -404,6 +424,7 @@ export default {
         this.tableData.loading = false;
         this.tableData.data = res.content;
         this.tableData.total = res.totalElements;
+
       } catch (error) {
         console.log(error);
       }
@@ -493,6 +514,7 @@ export default {
             this.dialogshow = false;
           } else {
             //添加
+            console.log(this.ruleForm,'调试')
             await posttbConsInfo({
               ...this.ruleForm
             });

src/views/shop/components/securitySetting.vue

@@ -2,8 +2,8 @@
     <div>
         <el-form ref="form" :model="form" label-width="120px" label-position="left">
             <el-form-item label="操作密码">
-                <el-input v-model="form.password" :disabled="disabled" placeholder="请输入操作密码"
+                <el-input v-model="form.password" type="number" @input="jiantingshuru" :disabled="disabled"
-                    style="width: 200px;"></el-input>
+                    :placeholder="disabled ? '******' : '请输入操作密码'" style="width: 200px;"></el-input>
                 <el-button type="primary" @click="resetting">重置</el-button>
             </el-form-item>
             <el-form-item label="安全手机号">
@@ -20,6 +20,7 @@
     </div>
 </template>
 <script>
+import md5 from 'js-md5';
 import { tbShopInfo } from "@/api/user";
 import { sendMsg, modfiyUserInfo } from "@/api/securitySetting"
 export default {
@@ -33,17 +34,20 @@ export default {
         this.getinfo()
     },
     methods: {
+        jiantingshuru(e) {
+            this.form.password = e.substr(0, 6)
+        },
         // 获取用户信息
         async getinfo() {
             const shopId = localStorage.getItem("shopId");
             const res = await tbShopInfo(shopId);
             this.form = res
-            this.form.password = '******'
+            // this.form.password = '******'
         },
         async submitHandle() {
             let data = {
                 code: this.form.prepareAmount,
-                pwd: this.form.password,
+                pwd: md5(this.form.password),
             }
             const res = await modfiyUserInfo(data);
             this.$message({