材料费比对+用户管理修改

src/components/jeecgbiz/JSelectPosition.vue

@@ -21,7 +21,7 @@
           columns: [
             { title: '职务名称', dataIndex: 'name', align: 'center', width: '30%', widthRight: '70%' },
             { title: '职务编码', dataIndex: 'code', align: 'center', width: '35%' },
-            { title: '职级', dataIndex: 'rank_dictText', align: 'center', width: '25%' }
+            // { title: '职级', dataIndex: 'rank_dictText', align: 'center', width: '25%' }
           ]
         }
       }

src/views/module_kzks/projectContrastList/wuliaoList.vue

@@ -31,25 +31,25 @@ var columns = [
     customRender:function (t,r,index) {
       return parseInt(index)+1;
     },
-    fixed:"left",
+    // fixed:"left",
   },
   {
     title: '规格型号',
     dataIndex: 'ggxh',
     width: 100,
     align: 'center',
-    fixed:"left",
+    // fixed:"left",
   },
   {
     title: '物料编码',
     dataIndex: 'wlbm',
-    // width: 100,
+    width: 100,
     align: 'center',
   },
   {
     title: '物料名称',
     dataIndex: 'wlmc',
-    // width: 100,
+    width: 100,
     align: 'center'
   },
 ]
@@ -123,13 +123,14 @@ export default {
                   align: 'center',
                   width: 90,
                   dataIndex: 'totalCount_' + item.taskno,
+                  customCell: this.setNumCustomCell,
                 },
                 {
                   title: '归一化单价(元)',
                   align: 'center',
                   width: 110,
                   dataIndex: 'unitPrice_' + item.taskno,
-                  customCell: this.setCustomCell,
+                  customCell: this.setPriceCustomCell,
                 }
               ]
             })
@@ -142,7 +143,8 @@ export default {
             objItem.ggxh = item.ggxh
             objItem.wlbm = item.wlbm
             objItem.wlmc = item.wlmc
-            objItem.equal = item.equal
+            objItem.amountEqual = item.amountEqual
+            objItem.countEqual = item.countEqual
             item.taskVoList.forEach(ele=>{
               // console.log(ele)
               objItem['flag_'+ele.taskno] = ele.flag==='yes'?'√':'×'
@@ -160,7 +162,7 @@ export default {
         this.loading = false
       })
     },
-    setCustomCell(record, index){
+    setPriceCustomCell(record, index){
       // console.log(record, index)
       // var arr = []
       // for (const item in record) {
@@ -170,7 +172,18 @@ export default {
       //   }
       // }
       // console.log(arr)
-      if(!record.equal){
+      if(!record.amountEqual){
+        return {
+          style: {
+            'color': '#ff1832',
+            // 'color': '#1890ff',
+          },
+        }
+      }
+    },
+    setNumCustomCell(record, index){
+      console.log(record)
+      if(!record.countEqual){
         return {
           style: {
             'color': '#ff1832',
@@ -183,7 +196,5 @@ export default {
 };
 </script>
 <!-- <style >
-.ant-table-body {
-  overflow-y: auto !important;
-  overflow: overlay !important;
-}</style> -->
+::v-deep .a-table__fixed-right { height: 100% !important; }
+</style> -->

src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -983,8 +983,11 @@ import { number } from 'echarts';
         // console.log(JSON.stringify(this.selectedRowKeys))
 
         var selectTasknos = this.selectionRows.map( res => {
-          return res.taskno
+          console.log(res.status)
+          var value = res.status === '1' ? res.taskno+'_-_pc' :  res.taskno
+          return value
         })
+        console.log(selectTasknos)
         this.duibiTasknos = selectTasknos.toString()
         this.duibiIds = this.selectedRowKeys.toString()
         this.duiBi = true

src/views/system/SysPositionList.vue

@@ -16,22 +16,22 @@
               <a-input placeholder="请输入职务名称" v-model="queryParam.name"></a-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
+          <!-- <template v-if="toggleSearchStatus">
             <a-col :md="6" :sm="8">
               <a-form-item label="职级">
                 <j-dict-select-tag v-model="queryParam.postRank" placeholder="请选择职级" dictCode="position_rank"/>
               </a-form-item>
             </a-col>
 
-          </template>
+          </template> -->
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
 
@@ -140,11 +140,11 @@
             align: 'center',
             dataIndex: 'name'
           },
-          {
-            title: '职级',
-            align: 'center',
-            dataIndex: 'postRank_dictText'
-          },
+          // {
+          //   title: '职级',
+          //   align: 'center',
+          //   dataIndex: 'postRank_dictText'
+          // },
           // {
           //   title: '公司id',
           //   align: 'center',

src/views/system/UserList.vue

@@ -9,33 +9,34 @@
           <a-col :md="6" :sm="12">
             <a-form-item label="账号">
               <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
-              <j-input placeholder="输入账号模糊查询" v-model="queryParam.username"></j-input>
+              <j-input placeholder="输入账号查询" v-model="queryParam.username"></j-input>
             </a-form-item>
           </a-col>
 
           <a-col :md="6" :sm="8">
-            <a-form-item label="性别">
-              <a-select v-model="queryParam.sex" placeholder="请选择性别">
-                <a-select-option value="">请选择</a-select-option>
-                <a-select-option value="1">男</a-select-option>
-                <a-select-option value="2">女</a-select-option>
-              </a-select>
+            <a-form-item label="真实名字">
+              <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
             </a-form-item>
+            
           </a-col>
 
 
           <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <a-form-item label="真实名字">
-                <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
+            <!-- <a-col :md="6" :sm="8">
+              <a-form-item label="性别">
+                <a-select v-model="queryParam.sex" placeholder="请选择性别">
+                  <a-select-option value="">请选择</a-select-option>
+                  <a-select-option value="1">男</a-select-option>
+                  <a-select-option value="2">女</a-select-option>
+                </a-select>
               </a-form-item>
-            </a-col>
+            </a-col> -->
 
-            <a-col :md="6" :sm="8">
+            <!-- <a-col :md="6" :sm="8">
               <a-form-item label="手机号码">
                 <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
 
             <a-col :md="6" :sm="8">
               <a-form-item label="用户状态">
@@ -208,16 +209,18 @@
         queryParam: {},
         recycleBinVisible: false,
         columns: [
-          /*{
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },*/
+          // {
+          //   title: '序号',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   // fixed: 'left',
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          // 修改：设置fixed出现空白列：fixed列设置width，其余不设置（自适应，获取有必须设置的设置的设置一下宽度）。设置了fixed后不要全都设置宽度会出现空白列
           {
             title: '用户账号',
             align: "center",
@@ -236,7 +239,7 @@
           {
             title: '头像',
             align: "center",
-            width: 120,
+            // width: 120,
             dataIndex: 'avatar',
             scopedSlots: {customRender: "avatarslot"}
           },
@@ -244,38 +247,38 @@
           {
             title: '性别',
             align: "center",
-            width: 80,
+            // width: 80,
             dataIndex: 'sex_dictText',
             sorter: true
           },
           {
-            title: '生日',
-            align: "center",
-            width: 100,
-            dataIndex: 'birthday'
-          },
-          {
-            title: '手机号码',
-            align: "center",
-            width: 100,
-            dataIndex: 'phone'
-          },
-          {
             title: '部门',
             align: "center",
-            width: 180,
+            // width: 200,
             dataIndex: 'orgCodeTxt'
           },
           {
             title: '负责部门',
             align: "center",
-            width: 180,
+            // width: 200,
             dataIndex: 'departIds_dictText'
           },
+          // {
+          //   title: '生日',
+          //   align: "center",
+          //   width: 100,
+          //   dataIndex: 'birthday'
+          // },
+          {
+            title: '手机号码',
+            align: "center",
+            // width: 100,
+            dataIndex: 'phone'
+          },
           {
             title: '状态',
             align: "center",
-            width: 80,
+            // width: 80,
             dataIndex: 'status_dictText'
           },
           {
@@ -306,7 +309,7 @@
     computed: {
       importExcelUrl: function(){
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
+      },
     },
     methods: {
       getAvatarView: function (avatar) {

src/views/system/modules/PasswordModal.vue

@@ -43,9 +43,11 @@
           password:{
             rules: [{
               required: true,
-              pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
-              message: '密码由8位数字、大小写字母和特殊符号组成!'
-            }, {
+              // pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+              // message: '密码由8位数字、大小写字母和特殊符号组成!'
+              message: '请输入密码!'
+            },
+            {
               validator: this.validateToNextPassword,
             }],
           },

src/views/system/modules/SysPositionModal.vue

@@ -28,7 +28,7 @@
           label="职务名称">
           <a-input placeholder="请输入职务名称" v-model="model.name"/>
         </a-form-model-item>
-        <a-form-model-item
+        <!-- <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           prop="postRank"
@@ -40,7 +40,7 @@
             dictCode="position_rank"
             v-model="model.postRank"
           />
-        </a-form-model-item>
+        </a-form-model-item> -->
 
       </a-form-model>
     </a-spin>

src/views/system/modules/UserModal.vue

@@ -40,11 +40,13 @@
           <a-input placeholder="请输入用户姓名" v-model="model.realname" />
         </a-form-model-item>
 
-        <a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workNo">
+        <a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <!-- 修改： prop="workNo" -->
           <a-input placeholder="请输入工号" v-model="model.workNo" />
         </a-form-model-item>
 
-        <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+        <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <!-- 修改： prop="phone" -->
           <a-input placeholder="请输入手机号码" v-model="model.phone" />
         </a-form-model-item>
 
@@ -163,8 +165,11 @@
         validatorRules:{
           username:[{required: true, message: '请输入用户账号!'},
             {validator: this.validateUsername,}],
-          password: [{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
-            {validator: this.validateToNextPassword,trigger: 'change'}],
+          password: [
+            // {required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
+            {required: true, message: '请输入密码!'},
+            {validator: this.validateToNextPassword,trigger: 'change'}
+          ],
           confirmpassword: [{required: true, message: '请重新输入登录密码!',},
             { validator: this.compareToFirstPassword,}],
           realname:[{ required: true, message: '请输入用户名称!' }],