2023-3-6

src/HDrpManagement/invoiceapp/detail/detail.vue

@@ -11,7 +11,7 @@
         idname="sa_invoiceapplyid"
         ownertable="sa_invoiceapply"
         :statusCheck="[{key:'status',value:'提交'},{key:'status',value:'审核'},{key:'status',value:'关闭'}]"
-        :tabs="['申请开票订单明细','蓝票信息','红票信息']"
+        :tabs="['申请开票订单明细','蓝票信息','红票信息','系统信息']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -30,11 +30,15 @@
       <div slot="slot2">
         <redInvoice :data="mainData" :status="mainData.status"></redInvoice>
       </div>
+      <div slot="slot3">
+        <detailInfo :more="true" :data="detailInfo"></detailInfo>
+      </div>
     </basicDetails>
   </div>
 </template>
 
 <script>
+import detailInfo from '@/components/detailInfo/index'
 import invoiceOrder from './tab/invoiceOrder/invoiceOrder.vue'
 import blueInvoice from './tab/blueInvoice/index.vue'
 import redInvoice from './tab/redInvoice/index.vue'
@@ -44,13 +48,15 @@ export default {
   data() {
     return {
       mainData:{},
-      mainAreaData:{}
+      mainAreaData:{},
+      detailInfo:[]
     }
   },
   components:{
     invoiceOrder,
     blueInvoice,
-    redInvoice
+    redInvoice,
+    detailInfo
   },
   methods:{
     async queryMainData(id) {
@@ -150,6 +156,19 @@ export default {
         },
         
       ]
+      this.detailInfo = [
+        {
+          title:'系统信息',
+          info: [
+            {label:'创建人',value:this.mainData.createby},
+            {label:'创建时间',value:this.mainData.createdate},
+            {label:'提交人',value:this.mainData.submitby},
+            {label:'提交时间',value:this.mainData.submitdate},
+            {label:'审核人',value:this.mainData.checkby},
+            {label:'审核时间',value:this.mainData.checkdate},
+          ]
+        }
+      ]
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {

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

@@ -81,6 +81,21 @@
           <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}/{{scope.row.auxunit}}</el-tag>
         </template>
       </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>
     <div style="margin-top:16px;text-align:right">
       <el-pagination

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

@@ -18,6 +18,16 @@
         label="状态"
         width="90">
       </el-table-column>
+      <!-- <el-table-column
+        prop="status"
+        label="发货数量"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="发货金额"
+        width="90">
+      </el-table-column> -->
       <el-table-column
         prop="billdate"
         label="发货日期">

src/HDrpManagement/payvoucher/details/modules/detailedData.vue

@@ -7,7 +7,7 @@
         <el-descriptions-item label="单据日期">{{ detailData.changedate?detailData.changedate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="经销商">{{ detailData.enterprisename?detailData.enterprisename:"--"}}</el-descriptions-item>
         <el-descriptions-item label="账户类型">{{ detailData.accountname?detailData.accountname:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="收入金额">{{ detailData.amount?tool.formatAmount(detailData.amount,2):"--" }}</el-descriptions-item>
+        <el-descriptions-item label="金额">{{ detailData.amount?tool.formatAmount(detailData.amount,2):"--" }}</el-descriptions-item>
         <el-descriptions-item label="分类">{{ detailData.class?detailData.class:"--" }}</el-descriptions-item>
         <el-descriptions-item label="分类明细">{{ detailData.subclass?detailData.subclass:"--" }}</el-descriptions-item>
         <el-descriptions-item :style="style(detailData.status)" label="状态">

src/HDrpManagement/recvoucher/details/index.vue

@@ -110,7 +110,6 @@ export default {
           label:'账户类型',
           value:this.mainData.accountname
         },
-
         {
           label:'企业名称',
           value:this.mainData.enterprisename
@@ -119,6 +118,10 @@ export default {
           label:'单据日期',
           value:this.mainData.createdate
         },
+        {
+          label:'金额',
+          value:this.tool.formatAmount(this.mainData.amount,2)
+        },
         {
           label:'分类',
           value:this.mainData.class

src/HDrpManagement/recvoucher/details/modules/detailedData.vue

@@ -7,7 +7,7 @@
         <el-descriptions-item label="单据日期">{{ detailData.changedate?detailData.changedate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="经销商">{{ detailData.enterprisename?detailData.enterprisename:"--"}}</el-descriptions-item>
         <el-descriptions-item label="账户类型">{{ detailData.accountname?detailData.accountname:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="支出金额">{{ detailData.amount?tool.formatAmount(detailData.amount,2):"--" }}</el-descriptions-item>
+        <el-descriptions-item label="金额">{{ detailData.amount?tool.formatAmount(detailData.amount,2):"--" }}</el-descriptions-item>
         <el-descriptions-item label="分类">{{ detailData.class?detailData.class:"--" }}</el-descriptions-item>
         <el-descriptions-item label="分类明细">{{ detailData.subclass?detailData.subclass:"--" }}</el-descriptions-item>
         <el-descriptions-item :style="style(detailData.status)" label="状态">

src/HDrpManagement/serveBill/components/add.vue

@@ -172,7 +172,35 @@ export default {
           { required: true, message: '请选择订单', trigger: 'change'},
         ],
         scenecontactphonenumber: [
-         { pattern:/^1[3-9][0-9]\d{8}$/, message: '请输入正确手机号码',trigger: 'blur' }
+          { required: true, message: '请填写手机号码', trigger: 'blur'},
+          { pattern:/^1[3-9][0-9]\d{8}$/, message: '请输入正确手机号码',trigger: 'blur' }
+        ],
+        province:[
+          { required: true, message: '请选择省市县', trigger: 'change'},
+        ],
+        address:[
+          { required: true, message: '请填写地址', trigger: 'blur'},
+        ],
+        scenecontact:[
+          { required: true, message: '服务联系人', trigger: 'blur'},
+        ],
+        scenecontactrole:[
+          { required: true, message: '联系人角色', trigger: 'blur'},
+        ],
+        class1:[
+          { required: true, message: '应用系统', trigger: 'change'},
+        ],
+        class2:[
+          { required: true, message: '客诉大类', trigger: 'change'},
+        ],
+        reason:[
+          { required: true, message: '申请原因', trigger: 'blur'},
+        ],
+        begdate:[
+          { required: true, message: '需求服务开始日期', trigger: 'change'},
+        ],
+        enddate:[
+          { required: true, message: '需求服务结束日期', trigger: 'change'},
         ],
       },
       agentParam: {

src/HDrpManagement/serveBill/components/edit.vue

@@ -172,7 +172,35 @@ export default {
           { required: true, message: '请选择订单', trigger: 'change'},
         ],
         scenecontactphonenumber: [
-         { pattern:/^1[3-9][0-9]\d{8}$/, message: '请输入正确手机号码',trigger: 'blur' }
+          { required: true, message: '请填写手机号码', trigger: 'blur'},
+          { pattern:/^1[3-9][0-9]\d{8}$/, message: '请输入正确手机号码',trigger: 'blur' }
+        ],
+        province:[
+          { required: true, message: '请选择省市县', trigger: 'change'},
+        ],
+        address:[
+          { required: true, message: '请填写地址', trigger: 'blur'},
+        ],
+        scenecontact:[
+          { required: true, message: '服务联系人', trigger: 'blur'},
+        ],
+        scenecontactrole:[
+          { required: true, message: '联系人角色', trigger: 'blur'},
+        ],
+        class1:[
+          { required: true, message: '应用系统', trigger: 'change'},
+        ],
+        class2:[
+          { required: true, message: '客诉大类', trigger: 'change'},
+        ],
+        reason:[
+          { required: true, message: '申请原因', trigger: 'blur'},
+        ],
+        begdate:[
+          { required: true, message: '需求服务开始日期', trigger: 'change'},
+        ],
+        enddate:[
+          { required: true, message: '需求服务结束日期', trigger: 'change'},
         ],
       },
       agentParam: {

src/HManagement/clueManage/m_activity/modules/add.vue

@@ -25,7 +25,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="活动负责人" prop="director">
-            <el-input v-model="form.director" placeholder="请输入活动负责人"></el-input>
+            <selectLeader></selectLeader>
           </el-form-item>
           <el-form-item label="地址" prop="address">
             <el-input v-model="form.address" placeholder="请输入地址"></el-input>
@@ -59,9 +59,10 @@
 </template>
 
 <script>
-
+import selectLeader from './selectAgent/index'
 export default {
   inject:['campaigntypeList'],
+  components:{selectLeader},
   data () {
     return {
       drawer:false,

src/HManagement/clueManage/m_activity/modules/selectAgent/agent/list.vue

@@ -0,0 +1,94 @@
+<template>
+  <div class="container normal-panel">
+    <p class="normal-title normal-margin">人员信息</p>
+    <div class="flex-align-center flex-between normal-margin">
+      <el-input style="width:270px" placeholder="请输入内容" v-model="param.content.where.condition" class="input-with-select" size="small" clearable>
+        <el-button slot="append" icon="el-icon-search"  @click="query_agent(param.content.sa_saleareaid)">查 询</el-button>
+      </el-input>
+      <slot name="add"></slot>
+    </div>
+    <tableLayout :layout="tablecols" :data="list" :custom="true" height="300px" fixedName="operation">
+       <template v-slot:customcol="scope">
+       
+        <p v-if="scope.column.columnname === 'status'">
+          <span :style="scope.column.data.status === '启用'?'color:#52C41A':'color:#FF3B30'">{{scope.column.data.status}}</span>
+        </p>
+        <p v-else-if="scope.column.columnname === 'province'">
+          <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
+        </p>
+        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+      </template>
+      <template v-slot:opreation="scope">
+        <slot name="detail" :data="scope.data"></slot>
+      </template>
+    </tableLayout>
+    <div style="margin-top:16px;text-align:right">
+      <el-pagination
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="param.content.pageSize"
+        layout="total, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data'],
+  data () {
+    return {
+      tablecols:[],
+      list:[],
+      total:0,
+      currentPage:1,
+      param:{
+        "id":'20221102090303',
+        "content": {
+          "pageSize":20,
+          "pageNumber":1,
+          "departmentids":[],
+          "containssub": 1,
+          "where":{}
+        }
+      }
+    }
+  },
+  methods:{
+    async query_agent (id) {
+      this.param.content.departmentids = [id]
+      const res = await this.$api.requested(this.param)
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.query_agent(this.param.content.departmentids)
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.query_agent(this.param.content.sa_saleareaid)
+    }
+  },
+  mounted () {
+    // this.query_agent()
+  },
+  created () {
+    // 获取角色表结构
+    this.tablecols = this.tool.tabelCol(this.$route.name)['activitylist'].tablecols
+  }
+}
+
+</script>
+<style scoped>
+/deep/.el-table {
+  width:900px !important;
+}
+</style>

src/HManagement/clueManage/m_activity/modules/selectAgent/agent/modules/add_agent.vue

@@ -0,0 +1,145 @@
+<template>
+  <div>
+    <div class="container normal-panel normal-margin">
+      <el-button type="warning" size="small" icon="el-icon-s-claim" @click="onSubmit">保 存</el-button>
+    </div>
+    <div class="container normal-panel normal-margin">
+      <p class="normal-title normal-margin">经销商信息</p>
+      <el-row :gutter="20">
+        <el-form :model="form" size="small" status-icon label-position="right" label-width="100px" class="demo-ruleForm">
+          <el-col :span="8">
+            <el-form-item label="经销商编号" prop="agentnum">
+              <el-input class="width-240" type="text" v-model="form.agentnum" placeholder="请输入" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="经销商名称" prop="agentname">
+              <el-input class="width-240" type="text" v-model="form.agentname" placeholder="请输入" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="省市县" prop="age">
+              <el-cascader
+                class="width-240"
+                v-model="value"
+                :options="basicData.data().areaData"
+                @change="cascaderChange">
+              </el-cascader>
+            </el-form-item>
+            <el-form-item label="地址" prop="address">
+              <el-input type="textarea" class="width-240" v-model.number="form.address"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系人" prop="contact">
+              <el-input class="width-240" type="text" v-model="form.contact" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="联系人手机号" prop="phonenumber">
+              <el-input class="width-240" type="number" v-model="form.phonenumber" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="所属营销区域" prop="sa_saleareaname">
+              <el-input class="width-240" readonly v-model.number="form.sa_saleareaname"></el-input>
+            </el-form-item>
+            <el-form-item label="合作开始时间" prop="age">
+              <el-date-picker
+                class="width-240"
+                v-model="form.signdate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="经销商类别" prop="pass">
+              <el-select class="width-240" v-model="form.agenttype" placeholder="请选择">
+                <el-option
+                  v-for="item in agent_type"
+                  :key="item.value"
+                  :label="item.value"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="伙伴类型" prop="partnertype">
+              <el-input class="width-240" type="text" readonly v-model="form.partnertype" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="上级经销商" prop="age">
+              <el-input class="width-240" v-model.number="form.age"></el-input>
+            </el-form-item>
+            <el-form-item label="经销商等级" prop="age">
+              <el-select class="width-240" v-model="form.grade" placeholder="请选择">
+                <el-option
+                  v-for="item in agent_level"
+                  :key="item.value"
+                  :label="item.value"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      value:[],
+      form:{
+        "sa_agentsid": 0,
+        "parentid":"",
+        "agentnum":"",
+        "agentname":"",
+        "address":"",
+        "agenttype":"",
+        "signdate":"",
+        "grade":'',
+        "sa_saleareaid":'',
+        "contact":"",
+        "phonenumber":"",
+        "province":"",
+        "city":"",
+        "county":""
+      },
+      arealist:[],
+      agent_type:[],
+      agent_level:[]
+    }
+  },
+  methods:{
+    initializeData () {
+      this.form.sa_saleareaid = this.$route.query.id
+      this.form.sa_saleareaname = this.$route.query.area
+      this.form.partnertype = '经销商'
+    },
+    cascaderChange (val) {
+      if (val.length === 1) 
+        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
+
+      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+      
+    },
+    async query_sysoptions () {
+      const res = await this.$store.dispatch('optiontypeselect','agentgrade')
+      this.agent_level = res.data
+      const res1 = await this.$store.dispatch('optiontypeselect','agenttype')
+      this.agent_type = res1.data
+    },
+    onSubmit () {
+      console.log(this.form)
+    }
+  },
+  mounted () {
+    this.initializeData()
+    this.query_sysoptions()
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.width-240{
+  width: 240px;
+}
+</style>

src/HManagement/clueManage/m_activity/modules/selectAgent/area/list.vue

@@ -0,0 +1,168 @@
+<template>
+  <div class="tree-panel">
+    <el-tree
+      ref="cusTreeRef"
+      :data="arealist"
+      node-key="sa_saleareaid"
+      default-expand-all
+      highlight-current
+      :show-checkbox="checked"
+      :check-strictly="true"
+      :check-on-click-node="true"
+      :expand-on-click-node="false"
+      :default-checked-keys="area_default"
+      @node-click="handleClick">
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <span>{{ node.label }}</span>
+        <span>
+          <slot name="operation" :data="data"></slot>
+        </span>
+      </span>
+    </el-tree>
+  </div>
+</template>
+
+<script>
+
+import {mapGetters} from 'vuex'
+
+export default {
+  props:['checked','area_default'],
+  components:{
+  },
+  computed:{
+    ...mapGetters({
+      pageOnlyRead:"pageOnlyRead"
+    })
+  },
+  data () {
+    return {
+      arealist:[],
+      cusChecked: [],
+      responseData:[]
+    }
+  },
+  methods:{
+    handleClick (row,node,VueComponent) {
+      this.$emit('onClick',node.data)
+    },
+    async query_arealist () {
+      const res = await this.$api.requested({
+        "classname": "webmanage.sale.salearea.salearea",
+        "method": "query_area",
+        "content": {
+        }
+      })
+      // 数据格式转换成elementui-tree所需的格式
+      this.responseData = res.data
+      this.arealist = this.createMenu(res.data)
+      this.$emit('onClick',this.arealist[0])
+    },
+    createMenu (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        // 新节点
+        var elNode = {
+          label: node["areaname"],
+          remarks:node["remarks"],
+          isused:node["isused"],
+          sa_saleareaid:node['sa_saleareaid'],
+          parentid:node['parentid'],
+          disabled:that.pageOnlyRead,
+          children: []
+        }
+          
+        if (node.subarea && node.subarea.length > 0) {
+          // 如果存在子节点
+          for (var index = 0; index < node.subarea.length; index++) {
+          // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+          elNode.children.push(convertToElementTree(node.subarea[index]));
+          }
+        }
+        return elNode;
+      }
+      array.forEach((element) => {
+        arr.push(convertToElementTree(element))
+      });
+      return arr
+    },
+    handleCheck (currentNode, treeStatus) {
+      /**
+       * @des 根据父元素的勾选或取消勾选，将所有子级处理为选择或非选中状态
+       * @param { node: Object }  当前节点
+       * @param { status: Boolean } （true ： 处理为勾选状态 ； false： 处理非选中）
+       */
+      const setChildStatus = (node, status) => {
+          /* 这里的 id children 也可以是其它字段，根据实际的业务更改 */
+          this.$refs.cusTreeRef.setChecked(node.sa_saleareaid, status)
+          if (node.children) {
+              /* 循环递归处理子节点 */
+              for (let i = 0; i < node.children.length; i++) {
+                  setChildStatus(node.children[i], status)
+              }
+          }
+      }
+      /* 设置父节点为选中状态 */
+      const setParentStatus = (nodeObj) => {
+          /* 拿到tree组件中的node,使用该方法的原因是第一次传入的 node 没有 parent */
+          const node = this.$refs.cusTreeRef.getNode(nodeObj)
+          if (node.parent.key) {
+              this.$refs.cusTreeRef.setChecked(node.parent, true)
+              setParentStatus(node.parent)
+          }
+      }
+
+      /* 判断当前点击是选中还是取消选中操作 */
+      if (treeStatus.checkedKeys.includes(currentNode.sa_saleareaid)) {
+          setParentStatus(currentNode)
+          setChildStatus(currentNode, true)
+      } else {
+          /* 取消选中 */
+          if (currentNode.children) {
+              setChildStatus(currentNode, false)
+          }
+      }
+
+      this.cusChecked = [...this.$refs.cusTreeRef.getCheckedKeys()]
+      this.$emit('onAreaChecked',this.cusChecked)
+    }
+  },
+  mounted () {
+    this.query_arealist()
+  },
+  watch:{
+    pageOnlyRead (val) {
+      console.log(val)
+      this.query_arealist()
+    },
+    area_default (val) {
+      // 如果存在默认组织数据就执行
+      this.$emit('onAreaChecked',this.area_default)
+    }
+  }
+}
+
+</script>
+<style>
+.tree-panel .el-tree {
+  background: none;
+}
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+  background: none;
+}
+</style>
+<style scoped>
+.tree-panel{
+  padding: 16px;
+  font-size: 14px;
+  /* width:300px; */
+  background: #FAFAFA;
+}
+</style>

src/HManagement/clueManage/m_activity/modules/selectAgent/index.vue

@@ -0,0 +1,86 @@
+<template>
+  <div>
+    <slot name="input"></slot>
+    <el-input v-model="value.enterprisename" readonly :placeholder="placeholder" suffix-icon="el-icon-arrow-down" autocomplete="off" @focus="onShow(dialogTableVisible=true)"></el-input>
+    <el-dialog :title="titleData" append-to-body :visible.sync="dialogTableVisible" width="1200px">
+      <div class="flex">
+        <!-- 营销区域列表 -->
+        <areaTree ref="arealist" style="width:200px" @onClick="onClick">
+        </areaTree>
+        <div>
+          <agent ref="agent">
+            <template v-slot:detail="scope">
+              <div class="inline-16">
+                <el-button  type="text" size="mini" @click="selectAgent(scope.data)">选 择</el-button>
+              </div>
+            </template>
+          </agent>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+  
+</template>
+
+<script>
+import areaTree from './area/list.vue'
+
+import agent from './agent/list.vue'
+export default {
+  props:["title"],
+  components:{
+    areaTree,
+    agent
+  },
+  data () {
+    return {
+      dialogTableVisible:false,
+      placeholder:"选择经销商",
+      areaInfo:{},
+      titleData:'选择人员',
+      value:{
+        enterprisename:'',
+        parentid:''
+      }
+    }
+  },
+  
+  methods:{
+    onShow () {
+      if (this.title !== ''){
+        this.titleData = this.title
+      }
+    },
+    onClick (data) {
+      console.log(this.value.enyerprisename)
+      this.areaInfo = data
+      this.$refs.agent.query_agent(this.areaInfo.sa_saleareaid)
+    },
+    onSuccess () {
+      this.$refs.arealist.query_arealist()
+    },
+    selectAgent (data) {
+      console.log(data)
+      this.value = data
+      this.$emit('selectAgent',data)
+      this.dialogTableVisible = false
+    },
+    onSalerSuccess () {
+      this.$refs.saler.query_saler(this.areaInfo.sa_saleareaid)
+    }
+  },
+  mounted() {
+    if (this.title !== ''){
+      this.placeholder = this.title
+    }
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.flex{
+  display: flex;
+}
+</style>

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

@@ -12,7 +12,7 @@
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="登录账号">{{mainInfo.accountno?mainInfo.accountno:'--'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="账号名称">{{mainInfo.username?mainInfo.username:'--'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="账号类型">{{mainInfo.usertypename?mainInfo.usertypename:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="授权角色">{{mainInfo.userrole?(mainInfo.userrole).toString():''}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="授权角色">{{mainInfo.userrole?mainInfo.userrole.map(item => item.remarks).join(','):''}}</el-descriptions-item>
 <!--          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="账号密码">
             <div class="flex-align-center flex-between">
               *******

src/SDrpManagement/agentOrder/details/index.vue

@@ -11,7 +11,7 @@
         delApiId="20221108152102"
         tags=""
         :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'提交'},{key:'status',value:'关闭'}]"
-        :tabs="['订单明细','基本信息','订单进度','居间费明细','发货单','物流单','发票记录','收支明细']"
+        :tabs="['订单明细','基本信息','订单进度','居间费明细','物流单','发票记录','收支明细']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation" class="inline-16">
@@ -47,16 +47,16 @@
       <div slot="slot3">
         <rebat></rebat>
       </div>
-      <div slot="slot4">
+      <!-- <div slot="slot4">
         <dispatch></dispatch>
-      </div>
-      <div slot="slot5">
+      </div> -->
+      <div slot="slot4">
         <logistics></logistics>
       </div>
-      <div slot="slot6">
+      <div slot="slot5">
         <invoiceTable></invoiceTable>
       </div>
-      <div slot="slot7">
+      <div slot="slot6">
         <revenue :data="mainData"></revenue>
       </div>
     </basicDetails>

src/SDrpManagement/agentOrder/details/tabs/defaultInfo.vue

@@ -21,6 +21,15 @@
       <el-descriptions-item label="联系电话">{{ mainData.contacts?mainData.contacts.phonenumber:"--" }}</el-descriptions-item>
       <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province?mainData.contacts.province:''}${mainData.contacts.city?mainData.contacts.city:''}${mainData.contacts.county?mainData.contacts.county:''}${mainData.contacts.address?mainData.contacts.address:''}`:'--'}}</el-descriptions-item>
     </el-descriptions>
+    <el-descriptions  class="normal-margin" border :column="2" labelClassName="my-label" contentClassName="my-content">
+      <div slot="title" class="my-label__title">系统信息</div>
+      <el-descriptions-item label="创建人">{{ mainData.createby?mainData.createby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="创建时间">{{ mainData.createdate?mainData.createdate:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="提交人">{{ mainData.submitby?mainData.submitby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="提交时间">{{ mainData.submitdate?mainData.submitdate:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="审核人">{{ mainData.checkby?mainData.checkby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="审核时间">{{ mainData.checkdate?mainData.checkdate:"--" }}</el-descriptions-item>
+    </el-descriptions>
 <!--    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">物流信息</div>
       

src/SDrpManagement/salerOrder/details/index.vue

@@ -11,7 +11,7 @@
         delApiId="20221108152102"
         tags=""
         :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'提交'},{key:'status',value:'关闭'}]"
-        :tabs="['订单明细','基本信息','订单进度','居间费明细','发货单','物流单','发票记录','收支明细']"
+        :tabs="['订单明细','基本信息','订单进度','居间费明细','物流单','发票记录','收支明细']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation" class="inline-16">
@@ -46,16 +46,16 @@
       <div slot="slot3">
         <rebat></rebat>
       </div>
-      <div slot="slot4">
+      <!-- <div slot="slot4">
         <dispatch></dispatch>
-      </div>
-      <div slot="slot5">
+      </div> -->
+      <div slot="slot4">
         <logistics></logistics>
       </div>
-      <div slot="slot6">
+      <div slot="slot5">
         <invoiceTable></invoiceTable>
       </div>
-       <div slot="slot7">
+       <div slot="slot6">
         <revenue :data="mainData"></revenue>
       </div>
     </basicDetails>

src/SDrpManagement/salerOrder/details/tabs/defaultInfo.vue

@@ -21,6 +21,15 @@
       <el-descriptions-item label="收货人电话">{{ mainData.contacts?mainData.contacts.phonenumber:"--" }}</el-descriptions-item>
       <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province}${mainData.contacts.city}${mainData.contacts.county}${mainData.contacts.address}`:'--'}}</el-descriptions-item>
     </el-descriptions>
+    <el-descriptions  class="normal-margin" border :column="2" labelClassName="my-label" contentClassName="my-content">
+      <div slot="title" class="my-label__title">系统信息</div>
+      <el-descriptions-item label="创建人">{{ mainData.createby?mainData.createby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="创建时间">{{ mainData.createdate?mainData.createdate:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="提交人">{{ mainData.submitby?mainData.submitby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="提交时间">{{ mainData.submitdate?mainData.submitdate:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="审核人">{{ mainData.checkby?mainData.checkby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="审核时间">{{ mainData.checkdate?mainData.checkdate:"--" }}</el-descriptions-item>
+    </el-descriptions>
 <!--    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">物流信息</div>
       

src/SDrpManagement/sinvoiceapp/detail/detail.vue

@@ -11,7 +11,7 @@
         idname="sa_invoiceapplyid"
         ownertable="sa_invoiceapply"
         :statusCheck="[{key:'status',value:'提交'},{key:'status',value:'审核'},{key:'status',value:'关闭'}]"
-        :tabs="['申请开票订单明细','蓝票信息','红票信息']"
+        :tabs="['申请开票订单明细','蓝票信息','红票信息','系统信息']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -29,11 +29,15 @@
       <div slot="slot2">
         <redInvoice :status="mainData.status"></redInvoice>
       </div>
+      <div slot="slot3">
+        <detailInfo :more="true" :data="detailInfo"></detailInfo>
+      </div>
     </basicDetails>
   </div>
 </template>
 
 <script>
+import detailInfo from '@/components/detailInfo/index'
 import invoiceOrder from './tab/invoiceOrder/invoiceOrder.vue'
 import blueInvoice from './tab/blueInvoice/index.vue'
 import redInvoice from './tab/redInvoice/index.vue'
@@ -43,13 +47,16 @@ export default {
   data() {
     return {
       mainData:{},
-      mainAreaData:{}
+      mainAreaData:{},
+      detailInfo:[]
+
     }
   },
   components:{
     invoiceOrder,
     blueInvoice,
-    redInvoice
+    redInvoice,
+    detailInfo
   },
   methods:{
     async queryMainData(id) {
@@ -142,6 +149,19 @@ export default {
         },*/
         
       ]
+      this.detailInfo = [
+        {
+          title:'系统信息',
+          info: [
+            {label:'创建人',value:this.mainData.createby},
+            {label:'创建时间',value:this.mainData.createdate},
+            {label:'提交人',value:this.mainData.submitby},
+            {label:'提交时间',value:this.mainData.submitdate},
+            {label:'审核人',value:this.mainData.checkby},
+            {label:'审核时间',value:this.mainData.checkdate},
+          ]
+        }
+      ]
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {

src/template/orderCanUseProduct/index.vue

@@ -64,6 +64,21 @@
           <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}/{{scope.row.auxunit}}</el-tag>
         </template>
       </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>
     <div style="margin-top:16px;text-align:right">
       <el-pagination