2023-223

src/HDrpManagement/invoiceapp/modules/add.vue

@@ -61,31 +61,7 @@
                 <el-input v-model="form.remarks" type="textarea" :aotusize="{minRows:4}" placeholder="备注"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-               <p class="normal-title normal-margin">开票信息</p>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="发票种类">
-                <el-select style="width:100%" v-model="form.invoiceline" placeholder="请选择">
-                  <el-option label="s/专用发票" value="s"></el-option>
-                  <el-option label="p/普通发票(电票)" value="p"></el-option>
-                </el-select>
-              </el-form-item>
-               <el-form-item label="发票限额" prop="quota">
-                <el-input v-model="form.quota" placeholder="发票限额"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="复核人">
-                <el-input v-model="form.invoicechecker" placeholder="发票复核人"></el-input>
-              </el-form-item>
-              <el-form-item label="收款人">
-                <el-input v-model="form.invoicepayee" placeholder="发票收款人"></el-input>
-              </el-form-item>
-              <el-form-item label="开票员">
-                <el-input v-model="form.invoiceclerk" placeholder="发票开票员"></el-input>
-              </el-form-item>
-            </el-col>
+       
           </el-form>
         </el-row>
       </div>

src/HDrpManagement/invoiceapp/modules/edit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="mini" :disabled="data.status !== '新建'" type="primary" @click="onShow">编 辑</el-button>
     <el-drawer
-      title="新建开票申请单"
+      title="编辑开票申请单"
       :visible.sync="drawer"
       direction="rtl"
       :show-close="false"
@@ -60,31 +60,6 @@
                 <el-input v-model="form.remarks" type="textarea" :aotusize="{minRows:4}" placeholder="备注"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-               <p class="normal-title normal-margin">开票信息</p>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="发票种类">
-                <el-select style="width:100%" v-model="value" placeholder="请选择">
-                  <el-option label="s/专用发票" value="s"></el-option>
-                  <el-option label="p/普通发票(电票)" value="p"></el-option>
-                </el-select>
-              </el-form-item>
-               <el-form-item label="发票限额">
-                <el-input v-model="form.quota" placeholder="开户账号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="复核人">
-                <el-input v-model="form.invoicechecker" placeholder="发票复核人"></el-input>
-              </el-form-item>
-              <el-form-item label="收款人">
-                <el-input v-model="form.invoicepayee" placeholder="发票收款人"></el-input>
-              </el-form-item>
-              <el-form-item label="开票员">
-                <el-input v-model="form.invoiceclerk" placeholder="发票开票员"></el-input>
-              </el-form-item>
-            </el-col>
           </el-form>
         </el-row>
       </div>

src/HDrpManagement/payvoucher/index.vue

@@ -9,7 +9,8 @@
         :options="options"
         :detailPath="{
         path:'/payvoucherDetails'
-        }">
+        }"
+        @listCreate="list">
       <div slot="titleRight">
         <!--        <importExcel style="margin-left:10px" @onSuccess="onSuccess"></importExcel>-->
       </div>
@@ -96,6 +97,9 @@ export default {
     }
   },
   methods:{
+    list (param) {
+      param.content.where.isrebate = 0
+    },
     /*营销账户类型*/
     async accountList(){
       const res = await this.$api.requested({

src/HDrpManagement/recvoucher/index.vue

@@ -9,7 +9,8 @@
         :options="options"
         :detailPath="{
         path:'/recvoucherDetails'
-        }">
+        }"
+        @listCreate="list">
       <div slot="custom" style="display:flex">
         <label class="search__label " style="margin: auto;width: 70px;">账户类型:</label>
         <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.accountname" placeholder="请选择账户类型" size="small" clearable>
@@ -87,6 +88,9 @@ export default {
     }
   },
   methods:{
+    list (param) {
+      param.content.where.isrebate = 0
+    },
     /*营销账户类型*/
     async accountList(){
       const res = await this.$api.requested({

src/SDrpManagement/agentOrder/modules/add.vue

@@ -5,7 +5,7 @@
       <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>

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -184,7 +184,7 @@
       <div class="mt-10">
         <div>
           <p class="normal-title inline-16">订单产品</p>
-          <el-button type="text" size="mini" @click="addMoreProduct">{{setcol === 12?'关闭选择':'添加产品'}}</el-button>
+          <!-- <el-button type="text" size="mini" @click="addMoreProduct">{{setcol === 12?'关闭选择':'添加产品'}}</el-button> -->
         </div>
         <el-row :gutter="10">
           <el-col :span="setcol">

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -1,7 +1,7 @@
 <template>
 <el-row :gutter="10">
   <el-col :span="setcol">
-    <!-- <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button> -->
+    <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
     <el-table
       ref="multipleTable"
       :data="tableData"
@@ -44,6 +44,29 @@
           <span v-else>{{scope.row.qty}}</span>
         </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.price,2)}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="折后价格"
+        prop="totalprice">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</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
         label="需求日期"
         width="200">
@@ -96,28 +119,6 @@
           <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</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.price,2)}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="折后价格"
-        prop="totalprice">
-        <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</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 v-if="data.status === '新建'" width="90" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>

src/SDrpManagement/sinvoiceapp/modules/edit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
     <el-drawer
-      title="新建开票申请单"
+      title="编辑开票申请单"
       :visible.sync="drawer"
       direction="rtl"
       :show-close="false"

src/SDrpManagement/toolBorrowing/detail/index.vue

@@ -14,12 +14,12 @@
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation" class="inline-16">
-        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData()"/>
+        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.tool.listData()"/>
         <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :disabled="mainData.status !== '交期待确认'" type="primary" size="mini" @click="confirmdate">确认交期</el-button>
         <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
       </div>
       <div slot="slot0" >
-        <toolList></toolList>
+        <toolList ref="tool"></toolList>
       </div>
       <div slot="slot1" >
       </div>