Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

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,37 +342,32 @@ export default {
       this.selectProductLength = data.length
     },
     async getQuotationList () {
-      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
-      console.log(this.ENlist,'报价单数据');
       
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.params.content.pageSize = val
+      this.getProductList()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.params.content.pageNumber = val
+      this.getProductList()
     },
     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/components/productList/productBillno.vue

@@ -194,10 +194,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.params.content.pageSize = val
+      this.listData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.params.content.pageNumber = val
+      this.listData()
     },
   },
 };

src/HDrpManagement/contractManage/modules/detail.vue

@@ -132,7 +132,7 @@
 import Del from '../components/delete'
 import editBtn from '../components/editContract'
 import SubmitCheck from '../components/submitCheck'
-import productBillno from '../components/productList/productBillno'
+import productBillno from '../components/productList/productBillno.vue'
 import productDetailList from '../components/productDetailList/productDetailList.vue'
 import addProduct from '../components/productList/addProduct'
 import addProductDetail from '../components/productDetailList/addProduct.vue'
@@ -390,7 +390,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:'折扣(%)',
@@ -753,7 +753,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:'折扣(%)',
@@ -775,9 +775,6 @@ export default {
                     label:'业务员',
                     value:this.mainData.salername
                   },
-
-
-
                   {
                     label:'状态',
                     value:this.mainData.status,
@@ -858,7 +855,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:'折扣(%)',
@@ -965,7 +962,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"
@@ -310,11 +330,11 @@
 
 <script>
 import addProduct from './addProduct'
-
+import excel from '../export_excel.vue'
 export default {
   props:['data','type'],
   components:{
-    excel:() =>  import('../export_excel'),
+    excel,
     addProduct
   },
   computed: {

src/HDrpManagement/orderManage/modules/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dropdown size="small" split-button type="primary" @command="handleCommand">
+    <!-- <el-dropdown size="small" split-button type="primary" @command="handleCommand">
       新 建
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="标准订单">标准订单</el-dropdown-item>
@@ -9,6 +9,18 @@
         <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>
         <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
       </el-dropdown-menu>
+    </el-dropdown> -->
+    <el-dropdown  @command="handleCommand">
+      <el-button type="primary" size="small">
+        新建<i class="el-icon-arrow-down el-icon--right"></i>
+      </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item command="标准订单">标准订单</el-dropdown-item>
+        <el-dropdown-item command="特殊订单">特殊订单</el-dropdown-item>
+        <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
+        <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>
+        <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
+      </el-dropdown-menu>
     </el-dropdown>
     <el-drawer
       title="新建订单"

src/HDrpManagement/orderManage/modules/edit.vue

@@ -212,6 +212,17 @@
         <p class="normal-title mt-10 inline-16">项目备注</p>
         <el-input size="mini" class="order__note__input" type="textarea" v-model="data.projectnote" :autosize="{minRows:5}" placeholder="请输入项目备注"></el-input>
       </div>
+      <div class="mt-10">
+        <p class="normal-title inline-16">寄付方式</p>
+      </div>
+      <div class="mt-10 flex-align-center">
+        <div :style="defaultData.freightstatus === '到付'?{background:'#d9ecff'}:{background:'#fff'}" class="reveive__panel normal-margin inline-16" @click="defaultData.freightstatus = '到付'">
+          <p>到付</p>
+        </div>
+        <div :style="defaultData.freightstatus === '预付'?{background:'#d9ecff'}:{background:'#fff'}" class="reveive__panel normal-margin" @click="defaultData.freightstatus = '预付'">
+          <p>预付</p>
+        </div>
+      </div>
       <div class="mt-10">
         <div>
           <p class="normal-title inline-16">订单产品</p>
@@ -277,7 +288,8 @@ export default {
         finance:{},
         accountclass:{},
         account_index:0,
-        remarks:this.data.remarks
+        remarks:this.data.remarks,
+        freightstatus:''
       },
       total:0,
       setcol:24,
@@ -372,6 +384,7 @@ export default {
 
     // 设置默认信息
     async setDefaultData () {
+      this.defaultData.freightstatus = this.data.freightstatus
       this.defaultData.rebatebalance = this.data.rebatebalance
       this.defaultData.finance = this.data.finance
       this.defaultData.fin_info = this.data.finance
@@ -410,7 +423,8 @@ export default {
           "signbacknum":'',
           "sa_promotionid":this.data.sa_promotionid,
           "billdate":this.billdate,
-          "projectnote":this.data.projectnote
+          "projectnote":this.data.projectnote,
+          "freightstatus":this.defaultData.freightstatus
         },
       })
       this.tool.showMessage(res,()=>{

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/add.vue

@@ -1,7 +1,18 @@
 <template>
   <div>
-    <el-dropdown size="small" split-button type="primary" @command="handleCommand">
+    <!-- <el-dropdown size="small" split-button type="primary" @command="handleCommand">
       新 建
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item command="标准订单">标准订单</el-dropdown-item>
+        <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
+        <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>
+        <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown> -->
+    <el-dropdown  @command="handleCommand">
+      <el-button type="primary" size="small">
+        新 建<i class="el-icon-arrow-down el-icon--right"></i>
+      </el-button>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="标准订单">标准订单</el-dropdown-item>
         <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>

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/add.vue

@@ -1,9 +1,21 @@
 <template>
   <div>
-    <el-dropdown size="small" split-button type="primary" @command="handleCommand">
+    <!-- <el-dropdown size="small" split-button type="primary" @command="handleCommand">
       新 建
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="标准订单">标准订单</el-dropdown-item>
+       <el-dropdown-item command="特殊订单">特殊订单</el-dropdown-item>
+        <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
+       <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>
+        <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown> -->
+    <el-dropdown @command="handleCommand">
+      <el-button type="primary" size="small">
+        新 建<i class="el-icon-arrow-down el-icon--right" ></i>
+      </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item command="标准订单">标准订单</el-dropdown-item>
 <!--        <el-dropdown-item command="特殊订单">特殊订单</el-dropdown-item>-->
         <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
 <!--        <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>-->

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="备注"

src/utils/tool.js

@@ -5,20 +5,27 @@ export default {
   checkAuth (appname,auth) {
     // console.log(appname)
     try {
+      let _haveAuth = true
+      
       let modules = JSON.parse(sessionStorage.getItem('active_modules'))
       
       let apps =  modules.apps
+
       // 获取当前应用数据
       let active_apps = apps.filter(item => {
         return item.name === appname
       })
+
       // 获取当前应用权限
       let auth_list = active_apps[0].meta.auth
+
       // 判断是否拥有权限
-      let _haveAuth = auth_list.some(item=>item.option === auth)
+      _haveAuth = auth_list.some(item=>item.option === auth)
+
       return _haveAuth
       
     } catch (error) {
+
     }
     
    
@@ -26,7 +33,6 @@ export default {
 
   // 获取应用表格
   tabelCol (appname) {
-    console.log(appname)
     try {
       // 获取应用数据
       let apps = JSON.parse(sessionStorage.getItem('active_modules'))