Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/business/spd/bo/behavior/index.vue

@@ -54,6 +54,15 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+    <div class="btn_grooup">
+      <el-button
+        type="warning"
+        plain
+        icon="el-icon-download"
+        size="mini"
+        @click="handleExport"
+      >导出</el-button>
+    </div>
     <el-table v-loading="loading" :data="behaviorList" height="700px">
       <el-table-column label="负责人" align="center" prop="staffName" />
       <el-table-column label="行动日期" align="center" prop="time" />
@@ -243,7 +252,6 @@
         <el-divider content-position="left">
           <dev style="width: 50px; height: 40px; font-size: 18px">照片信息</dev>
         </el-divider>
-
         <el-upload
           action="actionUrl"
           list-type="picture-card"
@@ -258,6 +266,21 @@
         <el-dialog :visible.sync="dialogVisible">
           <img width="100%" :src="dialogImageUrl" alt="">
         </el-dialog>
+        
+        <div v-if="form.stage">
+          <el-divider content-position="left">
+            <dev style="width: 50px; height: 40px; font-size: 18px">签卡信息</dev>
+          </el-divider>
+          <el-table v-loading="loading" :data="form.behaviorXys" height="150px">
+            <el-table-column label="签卡类型" align="center" prop="type">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.mk_bo_signintype" :value="scope.row.type"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="签卡时间" align="center" prop="createTime" />
+            <el-table-column label="签到地址" align="center" prop="address" />
+          </el-table>
+        </div>
 
         <div class="md-auditInfo">
           <el-divider content-position="left">
@@ -300,7 +323,7 @@ import { listBehavior, getBehavior} from "@/api/business/spd/bo/behavior";
 
 export default {
   name: "Behavior",
-  dicts: ['mk_bo_behavior_res','mk_bo_behavior_type','sys_yes_no','mk_bo_behavior_goal'],
+  dicts: ['mk_bo_behavior_res','mk_bo_behavior_type','sys_yes_no','mk_bo_behavior_goal','mk_bo_signintype'],
   data() {
     return {
       // 遮罩层
@@ -353,6 +376,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.params = {source:"list"};
     this.getList();
   },
   methods: {
@@ -425,6 +449,21 @@ export default {
       this.dateRange = [];
       this.handleQuery();
     },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.queryParams.params.pageNot = '1';
+      this.download('mk/bo/behavior/export', {
+        ...this.queryParams
+      }, `behavior_${new Date().getTime()}.xlsx`)
+    },
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.btn_grooup {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+</style>

src/views/purchase/DemandSummary/index.vue

@@ -348,7 +348,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="queryParams.pageNum"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 500]"
           :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>

src/views/purchase/MaterialClassDivision/index.vue

@@ -262,7 +262,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="queryParams.pageNum"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 500]"
           :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>

src/views/purchase/PurchaseDemandList/index.vue

@@ -219,7 +219,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="queryParams.pageNum"
-          :page-sizes="[10, 20 ,50 ,100]"
+          :page-sizes="[10, 20, 50, 100, 200, 500]"
           :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>

src/views/purchase/apply/add/columns.js

@@ -279,10 +279,10 @@ export default function useColumns() {
           },
         },
         {
-          item: { key: "isPriceAdjustment", title: "价格调整" },
+          item: { key: "isPriceAdjustment", title: "调价类型" },
           attr: {
             is: "el-select",
-            dictName: "is_effective",
+            dictName: "price_adjustment_type",
             disabled: true,
           },
         },

src/views/purchase/apply/add/index.vue

@@ -110,6 +110,25 @@
           });
         }
       },
+      // 
+      async changeCustomerName(prop) {
+        console.log("prop", prop)
+        const {
+          puOrg,
+          supplier,
+          currency,
+          currencyCode,
+          currencyName,
+        } = this.params;
+        const {
+          recentlyPrice,
+          isApprovalFirst,
+          purchasequantity
+          } = await fetchExist({puOrg, supplier, materialCode: prop.row.materialCode, customer:prop.row.customer,customerName: prop.row.customerName});
+          prop.row.yPurchaseQuantity = purchasequantity
+          prop.row.recentlyPrice = recentlyPrice
+          prop.row.isApprovalFirst = isApprovalFirst
+      },
       //
       async onOpen() {
         this.visible = true;
@@ -252,6 +271,16 @@
                 >
                 </component>
               </template>
+              <template slot="customerName" slot-scope="scope">
+                <component
+                  v-bind="scope.attr"
+                  v-model="scope.row[scope.item.key]"
+                  :size="$attrs.size"
+                  :source.sync="scope.row"
+                  @change="changeCustomerName({ ...scope, selectData: $event })"
+                >
+                </component>
+              </template>
               <el-table-column fixed="right" label="操作" width="100">
                 <template slot="header" slot-scope="scope">
                   <el-button

src/views/purchase/apply/copy/columns.js

@@ -279,10 +279,10 @@ export default function useColumns() {
           },
         },
         {
-          item: { key: "isPriceAdjustment", title: "价格调整" },
+          item: { key: "isPriceAdjustment", title: "调价类型" },
           attr: {
             is: "el-select",
-            dictName: "is_effective",
+            dictName: "price_adjustment_type",
             disabled: true,
           },
         },

src/views/purchase/apply/copy/index.vue

@@ -126,6 +126,25 @@ export default {
         });
       }
     },
+      // 
+      async changeCustomerName(prop) {
+        console.log("prop", prop)
+        const {
+          puOrg,
+          supplier,
+          currency,
+          currencyCode,
+          currencyName,
+        } = this.params;
+        const {
+          recentlyPrice,
+          isApprovalFirst,
+          purchasequantity
+          } = await fetchExist({puOrg, supplier, materialCode: prop.row.materialCode, customer:prop.row.customer,customerName: prop.row.customerName});
+          prop.row.yPurchaseQuantity = purchasequantity
+          prop.row.recentlyPrice = recentlyPrice
+          prop.row.isApprovalFirst = isApprovalFirst
+      },
     //
     async fetchItem(prop) {
       try {
@@ -306,6 +325,16 @@ export default {
                 >
                 </component>
               </template>
+              <template slot="customerName" slot-scope="scope">
+                <component
+                  v-bind="scope.attr"
+                  v-model="scope.row[scope.item.key]"
+                  :size="$attrs.size"
+                  :source.sync="scope.row"
+                  @change="changeCustomerName({ ...scope, selectData: $event })"
+                >
+                </component>
+              </template>
               <el-table-column fixed="right" label="操作" width="100">
                 <template slot="header" slot-scope="scope">
                   <el-button :size="$attrs.size" @click="onRowAdd(tabName)">

src/views/purchase/apply/edit/columns.js

@@ -279,10 +279,10 @@ export default function useColumns() {
           },
         },
         {
-          item: { key: "isPriceAdjustment", title: "价格调整" },
+          item: { key: "isPriceAdjustment", title: "调价类型" },
           attr: {
             is: "el-select",
-            dictName: "is_effective",
+            dictName: "price_adjustment_type",
             disabled: true,
           },
         },

src/views/purchase/apply/edit/index.vue

@@ -131,7 +131,7 @@
           const {
             recentlyPrice = "0",
             isApprovalFirst = "N",
-            isPriceAdjustment = "N",
+            isPriceAdjustment = "",
           } = await fetchExist({puOrg, customer, supplier, materialCode, customerName: ""});
           this.loading = false;
           await this.onRowAdd(this.tabName, {
@@ -155,6 +155,25 @@
           });
         }
       },
+      // 
+      async changeCustomerName(prop) {
+        console.log("prop", prop)
+        const {
+          puOrg,
+          supplier,
+          currency,
+          currencyCode,
+          currencyName,
+        } = this.params;
+        const {
+          recentlyPrice,
+          isApprovalFirst,
+          purchasequantity
+          } = await fetchExist({puOrg, supplier, materialCode: prop.row.materialCode, customer:prop.row.customer,customerName: prop.row.customerName});
+          prop.row.yPurchaseQuantity = purchasequantity
+          prop.row.recentlyPrice = recentlyPrice
+          prop.row.isApprovalFirst = isApprovalFirst
+      },
       //
       async fetchItem(prop) {
         try {
@@ -328,6 +347,16 @@
                 >
                 </component>
               </template>
+              <template slot="customerName" slot-scope="scope">
+                <component
+                  v-bind="scope.attr"
+                  v-model="scope.row[scope.item.key]"
+                  :size="$attrs.size"
+                  :source.sync="scope.row"
+                  @change="changeCustomerName({ ...scope, selectData: $event })"
+                >
+                </component>
+              </template>
               <el-table-column fixed="right" label="操作" width="100">
                 <template slot="header" slot-scope="scope">
                   <el-button :size="$attrs.size" @click="onRowAdd(tabName)">

src/views/purchase/apply/see/columns.js

@@ -167,10 +167,10 @@ export default function useColumns() {
           },
         },
         {
-          item: { width: 100, key: "isPriceAdjustment", title: "价格调整" },
+          item: { width: 100, key: "isPriceAdjustment", title: "调价类型" },
           attr: {
             is: "el-dict-tag",
-            dictName: "is_effective",
+            dictName: "price_adjustment_type",
           },
         },
         {

src/views/purchase/deliveryAddress/index.vue

@@ -229,7 +229,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="queryParams.pageNum"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 500]"
           :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>

src/views/purchase/transferOrder/add.vue

@@ -367,7 +367,7 @@
                             scope.$index,
                             'DEPT_PARAM',
                             true,
-                            '调入部门',{drpOrg:basicForm.deliveryInventoryOrg}
+                            '调入部门',{drpOrg:basicForm.storageInventoryOrg}
                           )
                         "
                       >
@@ -381,7 +381,7 @@
                               scope.$index,
                               'DEPT_PARAM',
                               true,
-                              '调入部门',{drpOrg:basicForm.deliveryInventoryOrg}
+                              '调入部门',{drpOrg:basicForm.storageInventoryOrg}
                             )
                           "
                         ></el-button>

src/views/purchase/transferOrder/index.vue

@@ -145,7 +145,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="queryParams.pageNum"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 500]"
           :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>