项目阶段管理，报价单调整

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/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,7 +24,7 @@
         <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
+<!--<<<<<<< HEAD
       <div slot="slot0" class=" normal-panel">
         <detailed :data="mainData"  v-if="flag"></detailed>
       </div>
@@ -40,17 +40,16 @@
       <div slot="slot4" class=" normal-panel">
         <contacts  :data="mainData"  v-if="flag"></contacts>
       </div>
-<!--      <div slot="slot4" class="container normal-panel">
+&lt;!&ndash;      <div slot="slot4" class="container normal-panel">
         <address_manage  :data="mainData"  v-if="flag"></address_manage>
-      </div>-->
-=======
+      </div>&ndash;&gt;
+=======-->
       <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">