2023-3-3

src/HDrpManagement/contractManage/components/productList/addProduct.vue

@@ -1,9 +1,10 @@
 <template>
   <div>
+    <!-- <el-button type="primary" size="small" @click="addBtn">添 加</el-button> -->
     <el-button type="primary" size="small" :disabled="disabled" @click="addBtn">添 加</el-button>
     <el-dialog title="报价单列表" append-to-body width="50%" :show-close="false" :visible.sync="drawer2">
       <div class="inline-16" style="margin-bottom:10px">
-        <el-input suffix-icon="el-icon-search" size="small" v-model="params2.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="getQuotationList(params2.content.pageNumber = 1)" @clear="getQuotationList(params2.content.pageNumber = 1)" clearable></el-input> 
+        <el-input suffix-icon="el-icon-search" size="small" v-model="params2.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="getQuotationList(params2.content.pageNumber=1)" @clear="getQuotationList(params2.content.pageNumber = 1)" clearable></el-input> 
       </div>
       <el-table
         :data="ENlist"
@@ -80,8 +81,8 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="params.content.pageNumber"
-              :page-sizes="[20, 50, 100, 200]"
-              layout="total, prev,sizes, pager, next, jumper"
+              :page-size="params.content.pageSize"
+              layout="total, prev, pager, next"
               :total="total">
           </el-pagination>
         </div>
@@ -122,20 +123,31 @@ export default {
         "content": {
             "sa_contractid": '',
             "pageNumber": 1,
-            "pageSize": 20,
+            "pageSize": 1,
             "nocache":true,
             "where": {
                 "condition": ""
             }
         },
       },
+      // params2: {
+      //   "id": 20221123162902,
+      //   "content": {
+      //       "sa_contractid": '',
+      //       "pageNumber": 1,
+      //       "pageSize": 20,
+      //       "nocache":true,
+      //       "where": {
+      //           "condition": ""
+      //       }
+      //   },
+      // }
       params2: {
-        "id": 20221123162902,
+        "id": 20221222151302,
         "content": {
-            "sa_contractid": '',
+            "sa_projectid": '',
             "pageNumber": 1,
-            "pageSize": 20,
-            "nocache":true,
+            "pageSize": 1,
             "where": {
                 "condition": ""
             }
@@ -330,18 +342,8 @@ export default {
       this.selectProductLength = data.length
     },
     async getQuotationList () {
-      // this.params2.content.sa_projectid = 
-      let res = await this.$api.requested({
-        "id": 20221222151302,
-        "content": {
-            "sa_projectid": this.data.sa_projectid,
-            "pageNumber": 1,
-            "pageSize": 20,
-            "where": {
-                "condition": ""
-            }
-        },
-      })
+      this.params2.content.sa_projectid = this.data.sa_projectid
+      let res = await this.$api.requested(this.params2)
       this.ENlist = res.data
       this.total2 = res.total
       
@@ -359,10 +361,13 @@ export default {
     handleSizeChange2(val) {
       // console.log(`每页 ${val} 条`);
       this.params2.content.pageSize = val
+      this.getQuotationList()
+
     },
     handleCurrentChange2(val) {
       // console.log(`当前页: ${val}`);
       this.params2.content.pageNumber = val
+      this.getQuotationList()
     },
   },
 };

src/HDrpManagement/contractManage/modules/detail.vue

@@ -370,7 +370,7 @@ export default {
           },
           {
             label:'签约金额(元)',
-            value:this.mainData.signamount?this.mainData.signamount:0
+            value:this.mainData.signamount?this.tool.formatAmount(this.mainData.signamount,2):0
           },
           {
             label:'折扣(%)',
@@ -733,7 +733,7 @@ export default {
                   },
                   {
                     label:'签约金额(元)',
-                    value:this.mainData.signamount?this.mainData.signamount:0
+                    value:this.mainData.signamount?this.tool.formatAmount(this.mainData.signamount,2):0
                   },
                   {
                     label:'折扣(%)',
@@ -755,9 +755,6 @@ export default {
                     label:'业务员',
                     value:this.mainData.salername
                   },
-
-
-
                   {
                     label:'状态',
                     value:this.mainData.status,
@@ -838,7 +835,7 @@ export default {
                   },
                   {
                     label:'签约金额(元)',
-                    value:this.mainData.signamount?this.mainData.signamount:0
+                    value:this.mainData.signamount?this.tool.formatAmount(this.mainData.signamount,2):0
                   },
                   {
                     label:'折扣(%)',
@@ -945,7 +942,7 @@ export default {
                   },
                   {
                     label:'签约金额(元)',
-                    value:this.mainData.signamount?this.mainData.signamount:0
+                    value:this.mainData.signamount?this.tool.formatAmount(this.mainData.signamount,2):0
                   },
                   {
                     label:'折扣(%)',

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -265,6 +265,26 @@
             <el-input size="mini" readonly v-model="scope.row.batchno" @input="rowChange(scope.row,scope.$index)" placeholder="输入批号"></el-input>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="material"
+          label="材质"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="prodline"
+          label="产线"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="device"
+          label="装置"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="specalnote"
+          label="特殊说明"
+          width="100">
+        </el-table-column>
         <el-table-column
           label="备注"
           width="300"

src/HManagement/accountManage/index.vue

@@ -74,8 +74,8 @@
         <p v-else-if="scope.data.column.columnname === 'roleName'">
           <span v-if="scope.data.column.data.userrole.length !== 0">
             <span v-for="(item,index) in scope.data.column.data.userrole">
-              <span v-if="index !== scope.data.column.data.userrole.length -1">{{item.rolename + '，'}}</span>
-              <span v-else>{{item.rolename }}</span>
+              <span v-if="index !== scope.data.column.data.userrole.length -1">{{item.remarks + '，'}}</span>
+              <span v-else>{{item.remarks }}</span>
             </span>
           </span>
 

src/HManagement/accountManage/modules/account_detail.vue

@@ -127,7 +127,7 @@ export default {
             {label:'登录账号',value:this.accountInfo.accountno},
             {label:'账号名称',value:this.accountInfo.username},
             {label:'账号类型',value:this.accountInfo.usertypename},
-            {label:'授权角色',value:this.accountInfo.userrole},
+            {label:'授权角色',value:this.accountInfo.userrole instanceof Array ? this.accountInfo.userrole.map(item => item.remarks).join(',') : this.accountInfo.userrole},
             {label:'电话',value:this.accountInfo.accountno !== ''?this.accountInfo.userphonenumber:this.accountInfo.phonenumber},
             {label:'办公电话',value:this.accountInfo.officetelephone},
             {label:'部门',value:this.accountInfo.depname},

src/HManagement/accountManage/modules/add.vue

@@ -77,7 +77,8 @@ export default {
         "phonenumber": "",
         "status": 1,
         "remarks":"",
-        "roleids":[]
+        "roleids":[],
+        "accountno":''
       },
       options:[]
     }

src/HManagement/accountManage/modules/edit.vue

@@ -128,7 +128,8 @@ export default {
             "name": this.form.name,
             "phonenumber": this.form.phonenumber,
             "remarks":this.form.remarks,
-            "roleids":this.form.roleids
+            "roleids":this.form.roleids,
+            "accountno":this.form.accountno
           }
         }).then(res=>{
           this.tool.showMessage(res,()=>{

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -170,6 +170,26 @@
         label="库存状态"
         width="100">
       </el-table-column>
+      <el-table-column
+        prop="material"
+        label="材质"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="prodline"
+        label="产线"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="device"
+        label="装置"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="specalnote"
+        label="特殊说明"
+        width="100">
+      </el-table-column>
       <el-table-column
         prop="remarks"
         label="备注"

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -186,6 +186,26 @@
         label="库存状态"
         width="100">
       </el-table-column>
+      <el-table-column
+        prop="material"
+        label="材质"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="prodline"
+        label="产线"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="device"
+        label="装置"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="specalnote"
+        label="特殊说明"
+        width="100">
+      </el-table-column>
       <el-table-column
         prop="remarks"
         label="备注"

vue.config.js

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