暂存

src/Form/projectStageMag/add.vue

@@ -28,7 +28,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="17">
-              <el-form-item label="请选择适用项目类型:" label-width="160px" prop="remarks">
+              <el-form-item label="请选择适用项目类型:" label-width="160px" prop="projecttype">
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -84,6 +84,9 @@ export default {
         remarks: [
           { required: true, message: '说明不能为空', trigger: 'blur' },
         ],
+        projecttype: [
+          { required: true, message: '还未选择项目类型', trigger: 'change' },
+        ],
       },
       param:{
         "classname": "sysmanage.develop.optiontype.optiontype",
@@ -146,7 +149,17 @@ export default {
       })
     },
     onClose(){
-
+      this.drawer = false
+      this.$refs.form.resetFields()
+      this.form = {
+        "sa_projstagemagid":0,
+        "stagename": "",
+        "remarks": "",
+        "allprojecttype":0,
+        "sequence":'',
+        "projecttype":''
+      }
+      this.selectType = []
     },
     checkboxCallBack(val){
       this.selectType = []

src/Form/projectStageMag/edit.vue

@@ -114,8 +114,26 @@ export default {
         }
       })
     },
-    onSubmit(){},
-    onClose(){},
+    async onSubmit(){
+      if (this.checked){
+        this.form.allprojecttype = 1
+      }else {
+        this.form.allprojecttype = 0
+      }
+      this.form.projecttype = this.selectType
+      console.log(this.form)
+      const res = await this.$api.requested({
+        "id": "20221128143504",
+        "content": this.form
+      })
+      this.tool.showMessage(res,()=>{
+        this.drawer = false
+        this.$emit('onSuccess')
+      })
+    },
+    onClose(){
+      this.drawer = false
+    },
     checkboxCallBack(val){
       this.selectType = []
       val.forEach((item,index)=>{

src/HDrpManagement/orderManage/details/index.vue

@@ -0,0 +1,109 @@
+<template>
+  <div>
+    <basicDetails
+        ref="details"
+        :titleText="`${mainData.sonum}`"
+        :oldFormPath="{edit:'HDrpManagement/orderManage/modules'}"
+        :editData="mainData"
+        :mainAreaData="mainAreaData"
+        turnPageId="20221111145202"
+        idname="sa_orderid"
+        ownertable="sa_order"
+        tags=""
+        :tabs="['基本信息','订单明细','订单进度']"
+        @pageChange="pageChange"
+        @onEditSuccess="queryMainData($route.query.id)">
+      <div slot="tags">
+      </div>
+      <div slot="customOperation" >
+      </div>
+      <div slot="slot0" >
+        <default-info :mainData="mainData"></default-info>
+      </div>
+      <div slot="slot1" >
+        <product-list></product-list>
+      </div>
+    </basicDetails>
+  </div>
+</template>
+
+<script>
+import defaultInfo from '../modules/defaultInfo.vue'
+import productList from '../modules/productlist.vue'
+
+export default {
+  name: "detail",
+  data() {
+    return {
+      mainData:{},
+      mainAreaData:{}
+    }
+  },
+  components:{
+    defaultInfo,
+    productList
+  },
+  methods:{
+    async queryMainData(id) {
+      const res = await this.$api.requested({
+        "id":'20221108151302',
+        "content": {
+          "sa_orderid": this.$route.query.id
+        }
+      })
+      this.mainData = res.data
+      this.changeDataStructure()
+    },
+    changeDataStructure() {
+      this.mainAreaData = [
+        {
+          label:'订单类型',
+          value:this.mainData.type
+        },
+        {
+          label:'订单状态',
+          value:this.mainData.status
+        },
+        {
+          label:'单据日期',
+          value:this.mainData.createdate
+        },
+        {
+          label:'合计数量',
+          value:this.mainData.qty
+        },
+        {
+          label:'合计金额',
+          value:this.mainData.amount
+        },
+        {
+          label:'折前金额',
+          value:this.mainData.defaultamount
+        },
+        {
+          label:'企业名称',
+          value:this.mainData.enterprisename
+        },
+        {
+          label:'备注',
+          value:this.mainData.remarks
+        }
+      ]
+    },
+    // 监听切换数据,上一页,下一页
+    pageChange (id,rowindex,tabIndex) {
+      this.$router.replace({path:'/orderdetail',query:{id:id,rowindex:rowindex}})
+      this.queryMainData(id)
+    }
+  },
+  mounted () {
+    this.queryMainData(this.$route.query.id)
+  },
+  created() {
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/orderManage/index.vue

@@ -0,0 +1,47 @@
+
+<template>
+  <div>
+    <basicLayout 
+      ref="basicLayout"
+      tableName="orderTable" 
+      idName="sa_orderid" 
+      :apiId="{query:20221111145202,del:20221108152102}"
+      :options="options"
+      :detailPath="{
+        path:'/orderdetail'
+      }">
+      <div slot="custom"></div>
+      <template v-slot:tbList="scope">
+        <div>
+          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        </div>
+      </template>
+      <template v-slot:tbOpreation="scope">
+      </template>
+    </basicLayout>
+  </div>
+</template>
+
+<script>
+/**
+ * @basicLayout 提供this.$ref['basicLayout'].listData()方法查询列表信息
+ * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹
+ * @param {string} tableName 开发端配置的表格名称
+ * @param {String} idName 数据主id名称
+ * @param {object} apiId:{query:查询的接口id,del:删除的接口id} 
+ * @param {Array} options:{label:描述,value:值} 
+ */
+export default {
+  data () {
+    return {
+      options:[]
+      
+    }
+  },
+  methods:{
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/orderManage/modules/defaultInfo.vue

@@ -0,0 +1,46 @@
+<template>
+  <div>
+    <el-descriptions class="normal-margin" :column="2"  border labelClassName="my-label" contentClassName="my-content">
+      <div slot="title" class="my-label__title">账户信息</div>
+      <el-descriptions-item label="账户名称">{{ mainData.accountclass?mainData.accountclass.accountname:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="账户余额">{{ mainData.balance?mainData.accountclass.balance:"--" }}</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.finance?mainData.finance.enterprisename:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="税号">{{ mainData.finance?mainData.finance.taxno:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="开户行">{{ mainData.finance?mainData.finance.bank:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="开户账号">{{ mainData.finance?mainData.finance.bankcardno:"--" }}</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.contacts?mainData.contacts.name:"--" }}</el-descriptions-item>
+      <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  border :column="2" labelClassName="my-label" contentClassName="my-content">
+      <div slot="title" class="my-label__title">物流信息</div>
+      
+      <el-descriptions-item label="物流公司">{{ mainData.logiscomp?mainData.logiscomp.enterprisename:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="快递100ID">{{ mainData.logiscomp?mainData.logiscomp.kd100id:"--" }}</el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+
+<script>
+export default {
+  props:["mainData"],
+  data(){
+    return {
+    }
+  },
+  mounted() {
+  },
+  methods:{
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/orderManage/modules/edit.vue

@@ -0,0 +1,12 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/orderManage/modules/productlist.vue

@@ -0,0 +1,129 @@
+<template>
+  <div>
+    <el-table
+      ref="multipleTable"
+      :data="tableData"
+      height="500px"
+      style="width: 100%;"
+      :header-cell-style="{height:'50px',color:'#768093',fontWeight:'400'}"
+      :cell-style="{height:'50px',color:'#768093',fontWeight:'400'}">
+      <!-- <el-table-column
+        type="selection"
+        width="55"
+        align="center">
+      </el-table-column> -->
+      <el-table-column
+        prop="itemname"
+        label="产品名称"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="itemno"
+        label="产品编号"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        label="型号/规格"
+        width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="数量"
+        width="150">
+        <template slot-scope="scope">
+          {{scope.row.qty}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="unit"
+        label="计量单位"
+        width="90">
+        <template slot-scope="scope">
+          <el-tag size="mini" type="info" effect="plain">{{scope.row.unitname}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="price"
+        label="价格"
+        width="90">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.gradeprice,2)}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="小计"
+        width="150">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column width="90">
+        <template slot-scope="scope">
+          <slot name="del" :data="scope.row"></slot>
+        </template>
+      </el-table-column>
+    </el-table>
+    <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 {
+  data () {
+    return {
+      tableData:[],
+      param:{
+        "id": 20221109093902,
+        "content": {
+          "sa_orderid": 0, //订单ID
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+              "condition": ""
+          }
+        },
+      },
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      this.param.content.sa_orderid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/projectStageMag/index.vue

@@ -57,7 +57,8 @@
         </div>
       </template>
       <template v-slot:tbOpreation="scope">
-        <edit v-if="tool.checkAuth($route.name,'update')" :data="scope.data"></edit>
+        <edit v-if="tool.checkAuth($route.name,'update')" :data="scope.data" @onSuccess="onSuccess" class="inline-16"></edit>
+        <del_stage v-if="tool.checkAuth($route.name,'delete')" :data="scope.data.data" @onSuccess="onSuccess" class="inline-16"></del_stage>
 <!--        <delete-btn v-if="tool.checkAuth($route.name,'delete')" :id="scope.data.data.sa_projstagetempid" @deleteSuccess="$refs.basicLayout.listData()" nameId="20221019085804" nameKey="sa_projstagetempids"/>-->
       </template>
     </basicLayout>
@@ -66,9 +67,10 @@
 
 <script>
 import edit from '@/Form/projectStageMag/edit'
+import del_stage from './modules/delStage'
 export default {
   name: "index",
-  components:{edit},
+  components:{edit,del_stage},
   projectType:() => this.projectType,
   data() {
     return {

src/HDrpManagement/projectStageMag/modules/delStage.vue

@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <el-popconfirm
+        title="确定删除该阶段嘛？"
+        @confirm="onDel"
+    >
+      <el-button size="mini" type="text" slot="reference">删 除</el-button>
+    </el-popconfirm>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "delStage",
+  props:['data'],
+  methods:{
+    async onDel(){
+      console.log(this.data,'删除')
+      const res = await this.$api.requested({
+        "id": 20221128143704,
+        "content": {
+          "sa_projstagemagids":[this.data.sa_projstagemagid]
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('onSuccess')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -24,33 +24,12 @@
         <submit_to class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.status === '新建'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onSubmit="onSuccess"></submit_to>
         <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '提交'" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
       </div>
-<<<<<<< HEAD
-      <div slot="slot0" class=" normal-panel">
-        <detailed :data="mainData"  v-if="flag"></detailed>
-      </div>
-      <div slot="slot1" class=" normal-panel">
-        <project_change :data="mainData" v-if="flag"></project_change>
-      </div>
-      <div slot="slot2" class=" normal-panel">
-        <productInventory :data="mainData" v-if="flag"></productInventory>
-      </div>
-      <div slot="slot3" class=" normal-panel">
-        <customer_assocalated :data="mainData" v-if="flag"></customer_assocalated>
-      </div>
-      <div slot="slot4" class=" normal-panel">
-        <contacts  :data="mainData"  v-if="flag"></contacts>
-      </div>
-<!--      <div slot="slot4" class="container normal-panel">
-        <address_manage  :data="mainData"  v-if="flag"></address_manage>
-      </div>-->
-=======
       <div slot="slot1" class=" normal-panel">
         <detailed :data="mainData"  v-if="flag"></detailed>
       </div>
       <div slot="slot0" class=" normal-panel">
         <productInventory :data="mainData" v-if="flag"></productInventory>
       </div>
->>>>>>> 382a5f32771cdce513d280fc4fbff13e907ede5a
     </basicDetails>
   </div>
 </template>

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -108,6 +108,7 @@
           </template>
         </el-table-column>
         <el-table-column
+            fixed="right"
             prop="num"
             label="数量"
             width="180">
@@ -117,6 +118,7 @@
         </el-table-column>
         <el-table-column
             prop="marketprice"
+            fixed="right"
             label="牌价"
             width="100">
           <template slot-scope="scope">
@@ -125,6 +127,7 @@
         </el-table-column>
         <el-table-column
             prop="discountrate"
+            fixed="right"
             label="折扣(%)"
             width="100">
           <template slot-scope="scope">
@@ -133,6 +136,7 @@
         </el-table-column>
         <el-table-column
             prop="price"
+            fixed="right"
             label="单价"
             width="100">
           <template slot-scope="scope">
@@ -141,6 +145,7 @@
         </el-table-column>
         <el-table-column
             prop="amount"
+            fixed="right"
             label="金额"
             width="100">
           <template slot-scope="scope">
@@ -149,6 +154,7 @@
         </el-table-column>
         <el-table-column
             prop="specialoffer"
+            fixed="right"
             label="是否特价"
             width="100">
           <template slot-scope="scope">
@@ -157,6 +163,7 @@
         </el-table-column>
         <el-table-column
             prop="operation"
+            fixed="right"
             label="操作"
             width="100">
           <template slot-scope="scope">

src/SDrpManagement/shopCart/modules/confirmOrder.vue

@@ -202,7 +202,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="unitid"
+            prop="unit"
             label="计量单位"
             width="90">
             <template slot-scope="scope">
@@ -336,17 +336,25 @@ export default {
       this.financiallist = res.data
       this.defaultData.fin_info = res.data[0]
     },
-    async submit() {
+    async onSubmit() {
+      
       const res = await this.$api.requested({
+        "id": 20221128183202,
         "content": {
           "sa_accountclassid": this.accountlist[this.defaultData.account_index].sa_accountclassid, //营销账户类型ID
           "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
           "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
           "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
           "remarks": this.defaultData.remarks, //可选
-          "items": []
+          "items": this.data.map(e=>{
+            e.sa_orderitemsid = 0
+            return e
+          })
         },
       })
+      this.tool.showMessage(res,()=>{
+        this.drawer = false
+      })
     }
   },
   mounted () {

src/SDrpManagement/shopCart/modules/list.vue

@@ -52,7 +52,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="unitid"
+        prop="unit"
         label="计量单位"
         width="90">
         <template slot-scope="scope">

src/components/normal-basic-layout/index.vue

@@ -13,7 +13,7 @@
             </div>
             <div style="margin:0 8px"></div>
             <div class="flex-align-center">
-              <cpAdd v-if="tool.checkAuth($route.name,'insert')" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>
+              <cpAdd v-if="tool.checkAuth($route.name,'insert') && oldFormPath" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>
               <el-button-group v-if="tool.checkAuth($route.name,'delete')" class="inline-16">
                 <el-button type="default" :disabled="selection.length === 0" size="small" @click="deleteData">删 除</el-button>
               </el-button-group>

src/router/HDrpManagement.js

@@ -9,6 +9,27 @@ const HDrpManagement = [
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/logisticcom/index'),
   },
+  {
+    path: '/ordermag',
+    name: 'ordermag',
+    meta: {
+      title: '订单管理',
+      ast_nav: true,
+      keeproute: true,
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/orderManage/index'),
+    children:[
+      {
+        path: '/orderdetail',
+        name: 'ordermag',
+        meta: {
+          title: '订单详情',
+          ast_nav: true,
+        },
+        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/orderManage/details/index'),
+      },
+    ]
+  },
   {
     path: '/brandmag',
     name: 'brandmag',