暂存

src/HDrpManagement/Creditbilladj/modules/enterpriseTable/add.vue

@@ -76,6 +76,13 @@
               <el-input type="text" size="small" placeholder="额度" v-model.number="scope.row.creditquota"></el-input>
             </template>
           </el-table-column>
+          <el-table-column
+              prop="remarks"
+              label="备注">
+            <template slot-scope="scope">
+              <el-input type="text" size="small" placeholder="备注" v-model.number="scope.row.remarks"></el-input>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <div class="fixed__btn__panel">
@@ -142,14 +149,15 @@ export default {
       
     },
     async onSubmit () {
-      let is = this.selectArr.every(item => item.sa_accountclassid && item.creditquota)
+      let is = this.selectArr.every(item => item.sa_accountclassid && (item.creditquota || item.creditquota === 0))
       if (is) {
         let data = this.selectArr.map(item => {
           return {
             "sa_creditbilldetailid":0,
               "sys_enterpriseid":item.sys_enterpriseid,
               "sa_accountclassid":item.sa_accountclassid,
-              "creditquota":item.creditquota
+              "creditquota":item.creditquota,
+              "remarks":item.remarks
           }
         })
         const res = await this.$api.requested({

src/HDrpManagement/contractManage/components/toolList/addTool.vue

@@ -8,19 +8,18 @@
           <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
           <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="batchSelects">批 量 添 加</el-button>
         </div>
-        <Table  ref="table" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="500px"  @upDateData="upDateData" @selection="selectArr" @onSelect="batchSelect">
+        <Table  ref="table" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="calc(100vh - 550px)"  @upDateData="upDateData" @selection="selectArr" @onSelect="batchSelect">
         </Table>
         <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">
           <span>已添加产品数:{{addProductLength}}</span>
           <el-pagination
-              style="display:inline-block"
               background
-              small
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="params.content.pageNumber"
               :page-sizes="[20, 50, 100, 200]"
-              layout="total, prev, pager, next, jumper"
+              :page-size="100"
+              layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
         </div>
@@ -57,7 +56,7 @@ export default {
         "content": {
           "sa_contractid": '',
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
               "condition": "",
               "istool":1//是否是工具
@@ -80,7 +79,7 @@ export default {
   },
   updated () {
     setTimeout(() => {
-      this.addProductLength = this.$parent.list.length
+      this.addProductLength = this.$parent.total
     },300)
   },
   methods: {

src/HDrpManagement/contractManage/components/toolList/toolList.vue

@@ -53,13 +53,12 @@
       <div style="float: right">
         <el-pagination
             background
-            small
-            style="text-align: right;"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page="params.content.pageNumber"
-            :page-size="params.content.pageSize"
-            layout="total, prev, pager, next, jumper"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="100"
+            layout="total,sizes, prev, pager, next, jumper"
             :total="total">
         </el-pagination>
       </div>
@@ -83,7 +82,7 @@ export default {
           "content": {
               "sa_contractid": '',
               "pageNumber": 1,
-              "pageSize": 20,
+              "pageSize": 100,
               "where": {
                   "condition": "",
               }
@@ -97,7 +96,8 @@ export default {
       tablecols:[],
       total:0,
       editIndex:'',
-      totalPrice:0
+      totalPrice:0,
+      currentPage:0
     };
   },
   computed:{

src/HDrpManagement/projectChange/modules/modules/productSet/add.vue

@@ -24,6 +24,7 @@
         <div class="produtMag-panel">
           <el-table
               ref="multipleTable"
+              height="930"
               :data="tableData"
               style="width: 100%"
               :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
@@ -54,33 +55,27 @@
                 width="180">
             </el-table-column>
             <el-table-column
-                label="型号"
+                prop="erpitemno"
+                label="品号"
                 width="180">
-              <template slot-scope="scope">
-                <p><span>{{scope.row.model || '--'}}</span></p>
-              </template>
             </el-table-column>
             <el-table-column
-                label="规格"
-                width="180">
-              <template slot-scope="scope">
-                <p><span>{{scope.row.spec || '--'}}</span></p>
-              </template>
+                prop="standards"
+                label="标准"
+                width="100">
             </el-table-column>
             <el-table-column
-                prop="caliber"
-                label="口径"
+                label="型号"
                 width="180">
               <template slot-scope="scope">
-                <p><span>{{scope.row.caliber || '--'}}</span></p>
+                <p><span>{{scope.row.model || '--'}}</span></p>
               </template>
             </el-table-column>
             <el-table-column
-                prop="pressure"
-                label="压力"
+                label="规格"
                 width="180">
               <template slot-scope="scope">
-                <p><span>{{scope.row.pressure || '--'}}</span></p>
+                <p><span>{{scope.row.spec || '--'}}</span></p>
               </template>
             </el-table-column>
             <el-table-column
@@ -193,12 +188,12 @@
             <div style="margin-top:16px;text-align:right">
               <el-pagination
                   background
-                  small
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
-                  :current-page="currentPage"
-                  :page-size="params.content.pageSize"
-                  layout="total, prev, pager, next, jumper"
+                  :current-page="params.content.pageNumber"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="100"
+                  layout="total,sizes, prev, pager, next, jumper"
                   :total="total">
               </el-pagination>
             </div>
@@ -241,7 +236,7 @@ export default {
         "content": {
           "sa_projectid": 2,
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": "",
             "tradefield": "",

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -23,13 +23,15 @@
           ref="multipleTable"
           :data="list"
           style="width: 100%"
+          :height="tableHieght"
           :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
           :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
           @selection-change="selectionChange"
           >
         <el-table-column
             type="selection"
-            width="55">
+            width="55"
+            fixed>
         </el-table-column>
         <el-table-column
             align="center"
@@ -52,41 +54,27 @@
             width="180">
         </el-table-column>
         <el-table-column
-            label="型号"
+            prop="erpitemno"
+            label="品号"
             width="180">
-          <template slot-scope="scope">
-            <p><span>{{scope.row.model || '--'}}</span></p>
-          </template>
         </el-table-column>
         <el-table-column
-            label="规格"
-            width="180">
-          <template slot-scope="scope">
-            <p><span>{{scope.row.spec || '--'}}</span></p>
-          </template>
+            prop="standards"
+            label="标准"
+            width="100">
         </el-table-column>
-        <!--            <el-table-column
-                        prop="unitid"
-                        label="起订量/增量"
-                        width="150">
-                      <template slot-scope="scope">
-                        <p><span>{{scope.row.orderminqty}}</span>&nbsp;/&nbsp;<span>{{scope.row.orderaddqty}}</span></p>
-                      </template>
-                    </el-table-column>-->
         <el-table-column
-            prop="caliber"
-            label="口径"
+            label="型号"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.caliber?scope.row.caliber:'--'}}</span></p>
+            <p><span>{{scope.row.model || '--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
-            prop="pressure"
-            label="压力"
+            label="规格"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.pressure?scope.row.pressure:'--'}}</span></p>
+            <p><span>{{scope.row.spec || '--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
@@ -194,14 +182,13 @@
         </div>
         <div style="float: right">
           <el-pagination
-              style="text-align:right"
               background
-              small
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="params.content.pageSize"
-              layout="total, prev, pager, next, jumper"
+              :current-page="params.content.pageNumber"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="100"
+              layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
         </div>
@@ -223,7 +210,7 @@ export default {
   components:{add,uploadFile, previewImage,delete_product},
   data () {
     return {
-      tableHieght:"600px",
+      tableHieght:"860px",
       totalPrice:0,
       tablecols:[],
       list:[],
@@ -239,7 +226,7 @@ export default {
         "content": {
           "sa_projectid": 2,
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": ""
           }

src/HManagement/department/staff/detail/index.vue

@@ -19,6 +19,7 @@
       <div slot="customOperation" >
         <linkAccount class="inline-16" v-if="tool.checkAuth($route.name,'update')"  :data="mainData"  @onSuccess="queryMainData"></linkAccount>
         <createUser class="inline-16" v-if="tool.checkAuth($route.name,'update') && !mainData.userid" :data="mainData"  @onSuccess="queryMainData"></createUser>
+        <restPas v-if="tool.checkAuth($route.name,'restpas')" class="inline-16"></restPas>
       </div>
       <div class="container normal-panel" slot="slot0" >
         <baseInfo :mainInfo="mainData"></baseInfo>

src/HManagement/department/staff/detail/modules/restPassword.vue

@@ -3,7 +3,7 @@
      <el-popconfirm
       title="确定重置当前账号密码吗？"
       @confirm="resetPassword()">
-       <el-button type="text" slot="reference" size="small" style="margin:-4px 0 0 10px">重置</el-button>
+       <el-button type="primary" slot="reference" size="small" style="margin:-4px 0 0 10px">重置密码</el-button>
     </el-popconfirm>
   </div>
 </template>

src/HManagement/siteManage/messageSendtype/index.vue

@@ -3,7 +3,7 @@
     <div class="container normal-panel normal-margin">
       <p class="normal-title normal-margin">消息提醒设置</p>
       <div class="flex-align-center" style="padding:50px;border-bottom:1px solid #eeeeee">
-        <!-- <div class="flex-align-center switch-panel">
+         <div class="flex-align-center switch-panel">
           <small>系统弹窗提醒&emsp;</small>
           <el-switch
             :active-value="1"
@@ -11,7 +11,7 @@
             v-model="form.remind_showdialog"
             @change="updateSite_Parameter">
           </el-switch>
-        </div> -->
+        </div>
         <div class="flex-align-center switch-panel">
           <small>邮件提醒&emsp;</small>
           <el-switch

src/HManagement/siteManage/securityConfig/index.vue

@@ -17,34 +17,36 @@
           <img width="72" height="72" src="../../../assets/icons/login_type_1.png" alt="">
           <div class="text-panel">
             <p class="explain-title">密码安全强制要求</p>
-            <p class="explain-tips">例:<span class="color-yellow">密码{{obj.password_length}}位数，{{obj.password_needcapital == 1?'大写英文字母，':''}}{{obj.password_needlowercase==1?'小写英文字母，':''}}{{obj.password_neednum==1?'数字0-9，':''}}{{obj.password_needspecialchar == 1?'特殊符号~,!,@,#,$,%,^;':''}}</span></p>
+            <p class="explain-tips">当前设置:<span class="color-yellow">密码{{obj.password_length}}位数，{{obj.password_needcapital == 1?'大写英文字母，':''}}{{obj.password_needlowercase==1?'小写英文字母，':''}}{{obj.password_neednum==1?'数字0-9，':''}}{{obj.password_needspecialchar == 1?'特殊符号~,!,@,#,$,%,^;':''}}</span></p>
           </div>
         </div>
-        <set-password v-if="tool.checkAuth($route.name,'psdValidate')"></set-password>
+        <set-password v-if="tool.checkAuth($route.name,'psdValidate')" @setPassword="querySite_Parameter"></set-password>
       </div>
     </div>
-    <!-- <div class="panel">
+     <div class="panel">
       <div class="flex-align-center flex-between">
         <div class="flex-align-stretch">
-          <img width="72" height="72" src="../../../assets/icons/login_type_2.png" alt="">
+          <img v-if="watermarkImage.length === 0" width="72" height="72" src="../../../assets/icons/login_type_2.png" alt="">
+          <img v-else width="72" height="72" :src=watermarkImage.image alt="">
           <div class="text-panel">
             <p class="explain-title">企业水印图片</p>
-            <p class="explain-tips">当前设置：已上传水印图片</p>
+            <p class="explain-tips">当前设置：{{watermarkImage.length === 0 ? '还未上传水印图片' : '已上传水印图片'}}</p>
           </div>
         </div>
-        <set-watermark :basicInfo="basicInfo" v-if="tool.checkAuth($route.name,'setWatermark')"></set-watermark>
+        <set-watermark :basicInfo="basicInfo" v-if="tool.checkAuth($route.name,'setWatermark')" @setWatermark="queryEnterpriseWatermark"></set-watermark>
       </div>
-    </div> -->
+    </div>
     <div class="panel">
       <div class="flex-align-center flex-between">
         <div class="flex-align-stretch">
-          <img width="72" height="72" src="../../../assets/icons/login_type_2.png" alt="">
+          <img v-if="productImage.length === 0" width="72" height="72" src="../../../assets/icons/login_type_2.png" alt="">
+          <img v-else width="72" height="72" :src=productImage.image alt="">
           <div class="text-panel">
             <p class="explain-title">产品默认图</p>
-            <p class="explain-tips">当前设置：已上传产品默认图</p>
+            <p class="explain-tips">当前设置：{{productImage.length === 0 ? '还未上传产品默认图':'已上传产品默认图'}}</p>
           </div>
         </div>
-        <productImage></productImage>
+        <productImage @setProductImage="productImage"></productImage>
       </div>
     </div>
     <div class="panel" style="margin-bottom:16px">
@@ -53,10 +55,10 @@
           <img width="72" height="72" src="../../../assets/icons/login_type_3.png" alt="">
           <div class="text-panel">
             <p class="explain-title">登录方式</p>
-            <p class="explain-tips">当前设置：{{obj.loginmode_account==1?'账号登录,':''}}{{obj.loginmode_phonenumber==1?'短信登录,':''}}</p>
+            <p class="explain-tips">当前设置：{{obj.loginmode_account === 1?'账号登录,':''}}{{obj.loginmode_phonenumber ===1?'手机动态短信登录,':''}}{{obj.loginmode_wechat ===1?'微信登录,':''}}</p>
           </div>
         </div>
-        <login-select v-if="tool.checkAuth($route.name,'loginType')"></login-select>
+        <login-select v-if="tool.checkAuth($route.name,'loginType')" @setLogin="querySite_Parameter"></login-select>
       </div>
     </div>
     <div class="container normal-panel" style="display:flex;justify-content:space-around;border-bottom:none">
@@ -95,7 +97,9 @@ export default {
   data () {
     return {
       basicInfo:{},
-      obj:{}
+      obj:{},
+      watermarkImage:{},
+      productImage:{}
     }
   },
   computed:{
@@ -114,6 +118,7 @@ export default {
       console.log(1);
       
     },
+    /*安全配置信息*/
     async querySite_Parameter () {
       
       const res = await this.$api.requested({
@@ -133,10 +138,46 @@ export default {
         loginmode_wechat:res.data.loginmode_wechat
       }
     },
+    /*企业水印*/
+    async queryEnterpriseWatermark(){
+      const res = await this.$api.requested({
+        "classname": "system.attachment.Attachment",
+        "method": "queryFileLink",
+        "content": {
+          "ownertable": 'sys_site',
+          "ownerid": this.siteinfo.siteuid,
+          "usetype":'watermark'//传空返回有所
+        }
+      })
+      console.log(res,'企业水印信息')
+      this.watermarkImage = {
+        length:res.data.length,
+        image:res.data.length !== 0 ? res.data[0].url: ''
+      }
+      console.log(this.watermarkImage)
+    },
+    /*产品默认图*/
+    async queryProductImage(){
+      const res = await this.$api.requested({
+        "classname": "system.attachment.Attachment",
+        "method": "queryFileLink",
+        "content": {
+          "ownertable": 'system',
+          "ownerid": 1,
+          "usetype":'defaultImage'//传空返回有所
+        }
+      })
+      this.productImage = {
+        length:res.data.length,
+        image:res.data.length !== 0 ? res.data[0].url: ''
+      }
+    }
   },
   mounted () {
     this.infoData()
     this.querySite_Parameter()
+    this.queryEnterpriseWatermark()
+    this.queryProductImage()
   }
 }
 

src/HManagement/siteManage/securityConfig/modules/loginSelect.vue

@@ -75,6 +75,7 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.dialogEditVisible = false
+        this.$emit('setLogin')
       })
     },
   }

src/HManagement/siteManage/securityConfig/modules/password.vue

@@ -96,9 +96,8 @@ export default {
         "content": this.form
       })
       if (res.code === 1) {
-        this.disabled?this.$message({
-          message:'修改成功',
-          type:'success'
+        this.disabled?this.tool.showMessage(res,()=>{
+          this.$emit("setPassword")
         }):this.setDefaultPassword()
         this.disabled?this.dialogFormVisible = false:''
       } else {

src/HManagement/siteManage/securityConfig/modules/productImage.vue

@@ -15,7 +15,7 @@
       </el-row>
       <div class="dialog-footer">
         <el-button size="small" @click="dialogEditVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="dialogEditVisible = false" class="normal-btn-width btn-warning">确 定</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -60,6 +60,10 @@ export default {
       })
       res.data[0]?this.image = res.data[0]:this.image = {url:''}
     },
+    onSubmit(){
+      this.dialogEditVisible = false
+      this.$emit('setProductImage')
+    }
   }
 }
 

src/HManagement/siteManage/securityConfig/modules/watermark.vue

@@ -15,7 +15,7 @@
       </el-row>
       <div class="dialog-footer">
         <el-button size="small" @click="dialogEditVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="dialogEditVisible = false" class="normal-btn-width btn-warning">确 定</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -60,6 +60,10 @@ export default {
       })
       res.data[0]?this.image = res.data[0]:this.image = {url:''}
     },
+    onSubmit(){
+      this.dialogEditVisible = false
+      this.$emit('setWatermark')
+    }
   }
 }
 

src/SDrpManagement/Products/index.vue

@@ -32,7 +32,7 @@ export default {
   components:{
     list,
     selectClass,
-    selectPeople
+    // selectPeople
   },
   methods:{
     selectClick (callback) {

src/components/productTable/index.vue

@@ -4,6 +4,7 @@
         ref="multipleTable"
         :data="data"
         style="width: 100%"
+        height="calc(100vh - 250px)"
         :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
         :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
         @selection-change="selectionChange">

vue.config.js

@@ -14,7 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'http://61.164.207.46:8000',  // target host*/
+            target: 'http://192.168.3.9:8080',
           // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets