暂存

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

@@ -330,6 +330,7 @@ export default {
       this.selectProductLength = data.length
     },
     async getQuotationList () {
+      // this.params2.content.sa_projectid = 
       let res = await this.$api.requested({
         "id": 20221222151302,
         "content": {
@@ -343,16 +344,17 @@ export default {
       })
       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} 条`);

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'

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

@@ -310,11 +310,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/projectChange/modules/modules/productSet/add.vue

@@ -57,30 +57,63 @@
                 label="型号"
                 width="180">
               <template slot-scope="scope">
-                <p><span>{{scope.row.model}}</span></p>
+                <p><span>{{scope.row.model || '--'}}</span></p>
               </template>
             </el-table-column>
             <el-table-column
                 label="规格"
                 width="180">
               <template slot-scope="scope">
-                <p><span>{{scope.row.spec}}</span></p>
+                <p><span>{{scope.row.spec || '--'}}</span></p>
               </template>
             </el-table-column>
             <el-table-column
                 prop="caliber"
                 label="口径"
                 width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.caliber || '--'}}</span></p>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="pressure"
                 label="压力"
                 width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.pressure || '--'}}</span></p>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="material"
                 label="材质"
                 width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.material || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="device"
+                label="装置"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.device || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="prodline"
+                label="产线"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.prodline || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="specalnote"
+                label="特殊说明"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.specalnote || '--'}}</span></p>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="brand"

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -55,14 +55,14 @@
             label="型号"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.model}}</span></p>
+            <p><span>{{scope.row.model || '--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
             label="规格"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.spec}}</span></p>
+            <p><span>{{scope.row.spec || '--'}}</span></p>
           </template>
         </el-table-column>
         <!--            <el-table-column
@@ -97,6 +97,30 @@
             <p><span>{{scope.row.material?scope.row.material:'--'}}</span></p>
           </template>
         </el-table-column>
+        <el-table-column
+            prop="material"
+            label="装置"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.device || '--'}}</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="material"
+            label="产线"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.prodline || '--'}}</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="material"
+            label="特殊说明"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.specalnote || '--'}}</span></p>
+          </template>
+        </el-table-column>
         <el-table-column
             prop="brand"
             label="品牌"

src/HManagement/accountManage/modules/account_detail.vue

@@ -21,6 +21,9 @@
       <div slot="slot0" >
         <detailInfo :more="true" :data="detailInfo"></detailInfo>
       </div>
+<!--      <div slot="slot1" >
+        <teamInformation></teamInformation>
+      </div>-->
       <div class="container normal-panel" slot="slot1" >
         <tableLayout :layout="table_roleinfo" :data="roleData" :opwidth="200" :custom="false">
           <!-- <template v-slot:opreation="scope">
@@ -37,6 +40,8 @@ import unuseTemp from './unuseAccount.vue'
 import useTemp from './useAccdount.vue'
 
 import detailInfo from '@/components/detailInfo/index'
+import teamInformation from './teamInformation/index'
+
 export default {
   name: "detail",
   data() {
@@ -56,7 +61,8 @@ export default {
   components:{
     unuseTemp,
     useTemp,
-    detailInfo
+    detailInfo,
+    teamInformation
   },
   methods:{
     async queryMainData(id) {

src/HManagement/accountManage/modules/teamInformation/add.vue

@@ -0,0 +1,46 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" >添 加</el-button>
+    <el-drawer
+        title="创建用户"
+        :visible.sync="drawer"
+        size="664px"
+        direction="rtl"
+        append-to-body
+        :show-close="false"
+       >
+      <div class="drawer__panel">
+        <el-row>
+          <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
+            <el-col :span="24">
+              <el-form-item label="账号" label-width="80px">
+                <el-input v-model="form.accountno" autocomplete="off" placeholder="编辑账号"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary"  class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "add",
+  data(){
+    return {
+      drawer:'',
+      form:{},
+      rules:{}
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/accountManage/modules/teamInformation/edit.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "edit"
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/accountManage/modules/teamInformation/index.vue

@@ -0,0 +1,115 @@
+<template>
+  <div>
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="我负责的" name="我负责的">
+        <div style="margin-bottom: 15px">
+          <add  class="inline-16"  ></add>
+        </div>
+        <div style="margin-top: 15px">
+          <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation">
+            <template v-slot:customcol="scope">
+              <div v-if="scope.column.columnname === 'operation'">
+                <span>{{scope.column.data[scope.column.columnname]}}</span>
+              </div>
+              <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+            </template>
+            <template v-slot:opreation="scope">
+              <!--          <edit  :data="scope.data" class="inline-16" @editSuccess="onSuccess" :disabled="data.disabled"></edit>
+                        <delContact  :data="scope.data" @delSuccess="onSuccess" class="inline-16" :disabled="data.disabled"></delContact>-->
+            </template>
+          </tableLayout>
+        </div>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+              background
+              small
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-size="params.content.pageSize"
+              layout="total, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="我参与的" name="我参与的">
+        <div style="margin-bottom: 15px">
+
+        </div>
+        <div style="margin-top: 15px">
+          <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation">
+            <template v-slot:customcol="scope">
+              <div v-if="scope.column.columnname === 'operation'">
+                <span>{{scope.column.data[scope.column.columnname]}}</span>
+              </div>
+              <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+            </template>
+            <template v-slot:opreation="scope">
+              <!--          <edit  :data="scope.data" class="inline-16" @editSuccess="onSuccess" :disabled="data.disabled"></edit>
+                        <delContact  :data="scope.data" @delSuccess="onSuccess" class="inline-16" :disabled="data.disabled"></delContact>-->
+            </template>
+          </tableLayout>
+        </div>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+              background
+              small
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-size="params.content.pageSize"
+              layout="total, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import add from './add'
+export default {
+  name: "index",
+  components:{add},
+  data(){
+    return {
+      tablecols:[],
+      list:[],
+      total:0,
+      currentPage:0,
+      activeName: '我负责的',
+      params:{
+        "id": 20230302174201,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where":{
+            "conditino":""
+          }
+        }
+      }
+    }
+  },
+  methods:{
+    handleClick(){},
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).teamTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -87,6 +87,30 @@
             <p><span>{{scope.row.material?scope.row.material:'--'}}</span></p>
           </template>
         </el-table-column>
+        <el-table-column
+            prop="device"
+            label="装置"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.device || '--'}}</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="prodline"
+            label="产线"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.prodline || '--'}}</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="specalnote"
+            label="特殊说明"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.specalnote || '--'}}</span></p>
+          </template>
+        </el-table-column>
         <el-table-column
             prop="brand"
             label="品牌"
@@ -145,9 +169,15 @@
           <template slot-scope="scope">
             <div v-if="scope.row.discountDifferenceAmount > 0 ">
               <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setTopColor]">{{scope.row.discountrate}}</span></p>
+              <span v-if="saveShow && index === scope.row.rowindex">
+                 <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
+              </span>
             </div>
             <div v-else-if="scope.row.discountDifferenceAmount < 0 ">
               <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setDownColor]">{{scope.row.discountrate}}</span></p>
+              <span v-if="saveShow && index === scope.row.rowindex">
+                 <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
+              </span>
             </div>
             <span v-else>
               <span v-if="saveShow && index === scope.row.rowindex">
@@ -177,9 +207,15 @@
           <template slot-scope="scope">
             <div v-if="scope.row.discountDifferenceAmount > 0 ">
               <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setTopColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
+              <span v-if="saveShow && index === scope.row.rowindex">
+                <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
+              </span>
             </div>
             <div v-else-if="scope.row.discountDifferenceAmount < 0 " >
               <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setDownColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
+              <span v-if="saveShow && index === scope.row.rowindex">
+                <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
+              </span>
             </div>
             <span v-else>
               <span v-if="saveShow && index === scope.row.rowindex">

src/components/productTable/index.vue

@@ -49,16 +49,49 @@
           prop="caliber"
           label="口径"
           width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.caliber || '--'}}</span></p>
+        </template>
       </el-table-column>
       <el-table-column
           prop="pressure"
           label="压力"
           width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.pressure || '--'}}</span></p>
+        </template>
       </el-table-column>
       <el-table-column
           prop="material"
           label="材质"
           width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.material || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="device"
+          label="装置"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.device || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="prodline"
+          label="产线"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.prodline || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="specalnote"
+          label="特殊说明"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.specalnote || '--'}}</span></p>
+        </template>
       </el-table-column>
       <el-table-column
           prop="brand"

src/components/productTable/indexQty.vue

@@ -32,33 +32,68 @@
           width="180">
       </el-table-column>
       <el-table-column
+          prop="model"
           label="型号"
           width="180">
         <template slot-scope="scope">
-          <p><span>{{scope.row.model}}</span></p>
+          <p><span>{{scope.row.model || ''}}</span></p>
         </template>
       </el-table-column>
       <el-table-column
+          prop="spec"
           label="规格"
           width="180">
         <template slot-scope="scope">
-          <p><span>{{scope.row.spec}}</span></p>
+          <p><span>{{scope.row.spec || ''}}</span></p>
         </template>
       </el-table-column>
       <el-table-column
           prop="caliber"
           label="口径"
           width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.caliber || '--'}}</span></p>
+        </template>
       </el-table-column>
       <el-table-column
           prop="pressure"
           label="压力"
           width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.pressure || '--'}}</span></p>
+        </template>
       </el-table-column>
       <el-table-column
           prop="material"
           label="材质"
           width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.material || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="device"
+          label="装置"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.device || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="prodline"
+          label="产线"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.prodline || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="specalnote"
+          label="特殊说明"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.specalnote || '--'}}</span></p>
+        </template>
       </el-table-column>
       <el-table-column
           prop="brand"