plm BMM

package-lock.json

@@ -4055,9 +4055,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.8.2.tgz",
-      "integrity": "sha512-LABKHKGUyewFNvpf9BQLecB659Wq0XYvyP1tBveZ4RWpdlPSylDfGW/RLvDYU7zuCBoRasdZAz7ryjOwq1lLNg==",
+      "version": "2.15.14",
+      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz",
+      "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -10567,8 +10567,8 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+      "resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
     },
     "now-and-later": {
       "version": "2.0.1",

src/assets/scss/_base.scss

@@ -237,7 +237,7 @@ img {
         width: 36px;
         height: auto;
         margin-right: 5px;
-        border-radius: 100%;
+        //border-radius: 100%;
         vertical-align: middle;
       }
     }

src/views/modules/sys/user-add-or-update.vue

@@ -87,6 +87,14 @@
             <el-input v-model="dataForm.domainControlAccount" style="width: 150px;" ></el-input>
           </el-form-item>
         </el-form>
+        <el-form>
+          <el-form-item :label="'ifs账号'" >
+            <el-input v-model="dataForm.ifsUsername" style="width: 150px;" ></el-input>
+          </el-form-item>
+          <el-form-item :label="'ifs密码'" >
+            <el-input v-model="dataForm.ifsPassword" type="password" style="width: 150px;" ></el-input>
+          </el-form-item>
+        </el-form>
         <el-form>
           <el-form-item label="角色" size="mini" prop="roleIdList">
             <el-checkbox-group v-model="dataForm.roleIdList">
@@ -137,6 +145,8 @@ export default {
       postList:[],
       dataForm: {
         id: 0,
+        ifsUsername:'',
+        ifsPassword:'',
         userName: '',
         password: '',
         comfirmPassword: '',
@@ -316,6 +326,8 @@ export default {
               this.dataForm.post = data.user.post
               this.dataForm.postNo = data.user.postNo
               this.dataForm.domainControlAccount = data.user.domainControlAccount
+              this.dataForm.ifsUsername = data.user.ifsUsername
+              this.dataForm.ifsPassword = data.user.ifsPassword
               this.getBDPList()
             }
           })
@@ -343,7 +355,9 @@ export default {
             siteID: '',
             siteName: '',
             userDisplay: '',
-            domainControlAccount: ''
+            domainControlAccount: '',
+            ifsUsername:'',
+            ifsPassword:'',
           }
         }
       })
@@ -370,7 +384,9 @@ export default {
               'buNo': this.dataForm.buNo,
               'departmentNo': this.dataForm.departmentNo,
               'postNo': this.dataForm.postNo,
-              'domainControlAccount': this.dataForm.domainControlAccount
+              'domainControlAccount': this.dataForm.domainControlAccount,
+              'ifsUsername': this.dataForm.ifsUsername,
+              'ifsPassword': this.dataForm.ifsPassword,
             })
           }).then(({data}) => {
             if (data && data.code === 0) {

src/views/modules/sys/user.vue

@@ -89,6 +89,12 @@
         align="center"
         :label="'域控账号'">
       </el-table-column>
+      <el-table-column
+        prop="ifsUsername"
+        header-align="center"
+        align="center"
+        :label="'ifs账号'">
+      </el-table-column>
       <el-table-column
         prop="email"
         header-align="center"

src/views/modules/tooling/searchToolApply.vue

@@ -173,7 +173,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="总成本(元)" >
-                <el-input v-model="currentRow.allCost" readonly></el-input>
+                <el-input v-field="accessField('10601001')" v-model="currentRow.allCost" readonly></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -467,7 +467,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="总成本(元)" >
-                  <el-input v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
+                  <el-input v-field="accessField('10601001')" v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -521,7 +521,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="总成本(元)" >
-              <el-input v-model="modelData.allCost" type="number" ></el-input>
+              <el-input v-field="accessField('10601001')" v-model="modelData.allCost" type="number" ></el-input>
             </el-form-item>
           </el-col>
         </el-row>