From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token

---
 src/components/makepager/CommonFormTableView.vue |  588 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 504 insertions(+), 84 deletions(-)

diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 60108e2..d2d5e5b 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -1,11 +1,24 @@
 <template>
-  <div class="page-view">
-    <el-form ref="form" :model="tableList" :show-message="false" label-position="right">
+  <div class="page-view" :class="{ setHeight: isinventory || islistingrules || isReorder }">
+    <el-form
+      ref="form"
+      :model="tableList"
+      :show-message="false"
+      label-position="right"
+      :class="{ setHeight: isinventory || islistingrules || isReorder }"
+    >
       <el-table
         :data="tableList.tableData"
+        border
         style="width: 100%"
+        :height="'calc(100% - 0px)'"
+        :class="{ setHeight: isinventory || islistingrules || isReorder }"
         :header-cell-style="{ background: '#f1f3f8', color: '#000009' }"
+        :row-class-name="tableRowClassName"
+        @row-click="tableRowClick"
       >
+        <el-table-column v-if="tableList.selectBox" type="selection" width="40" align="center"> </el-table-column>
+        <el-table-column v-if="tableList.selectIndex" type="index" label="搴忓彿" width="50"> </el-table-column>
         <el-table-column
           v-for="(item, i) in tableList.tableColumn"
           :key="i"
@@ -29,16 +42,18 @@
                 :prop="'tableData.' + scope.$index + '.' + item.prop"
                 :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
               >
-                <el-input
-                  v-model.trim="scope.row[item.prop]"
-                  maxlength="50"
-                  size="mini"
-                  @change="
-                    (val) => {
-                      commonInputChange(val, item.prop, scope.row)
-                    }
-                  "
-                ></el-input>
+                <div @click.stop="commoInput">
+                  <el-input
+                    v-model.trim="scope.row[item.prop]"
+                    maxlength="50"
+                    size="mini"
+                    @change="
+                      (val) => {
+                        commonInputChange(val, item.prop, scope.row)
+                      }
+                    "
+                  ></el-input>
+                </div>
               </el-form-item>
               <el-form-item
                 v-else-if="item.productName"
@@ -46,7 +61,151 @@
                 :prop="'tableData.' + scope.$index + '.' + item.prop"
               >
                 <div class="custom-name">
+                  <SimpleSearchInput
+                    :echoValue="scope.row[item.prop]"
+                    :echoName="scope.row[item.prop]"
+                    checkedNum="1"
+                    :clearable="true"
+                    @select-user="selProductNameClick"
+                  >
+                  </SimpleSearchInput>
+                </div>
+              </el-form-item>
+              <el-form-item
+                v-else-if="item.date"
+                label=" "
+                :prop="'tableData.' + scope.$index + '.' + item.prop"
+                :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
+              >
+                <span v-if="scope.row.isEdit">{{ scope.row[item.prop] }}</span>
+                <el-date-picker v-else v-model="scope.row[item.prop]" type="date" size="mini" style="width: 100%">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item
+                v-else-if="item.inputNumber"
+                label=" "
+                :prop="'tableData.' + scope.$index + '.' + item.prop"
+                :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
+              >
+                <div @click.stop="commoInput">
+                  <el-input-number
+                    v-model="scope.row[item.prop]"
+                    placeholder=""
+                    :min="0"
+                    :controls="false"
+                    size="mini"
+                    style="width: 100%; margin-right: 5px"
+                    @change="
+                      (val) => {
+                        commonInputChange(val, item.prop, scope.row)
+                      }
+                    "
+                  ></el-input-number>
+                </div>
+              </el-form-item>
+              <el-form-item
+                v-else-if="item.inputFloat"
+                label=" "
+                :prop="'tableData.' + scope.$index + '.' + item.prop"
+                :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
+              >
+                <span v-if="scope.row.isEdit">{{ scope.row[item.prop] }}</span>
+                <div v-else @click.stop="commoInput">
+                  <el-input-number
+                    v-model="scope.row[item.prop]"
+                    placeholder=""
+                    :precision="2"
+                    :controls="false"
+                    size="mini"
+                    style="width: 100%; margin-right: 5px"
+                    @change="
+                      (val) => {
+                        commonInputChange(val, item.prop, scope.row)
+                      }
+                    "
+                  ></el-input-number>
+                </div>
+              </el-form-item>
+              <el-form-item v-else-if="item.select" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+                <div class="custom-name">
                   <el-select
+                    v-model="scope.row[item.prop]"
+                    placeholder="璇烽�夋嫨"
+                    size="mini"
+                    style="width: 63%"
+                    @change="selCommonClick"
+                  >
+                    <el-option v-for="(item, index) in selOptions" :key="index" :label="item.name" :value="item">
+                    </el-option>
+                  </el-select>
+                </div>
+              </el-form-item>
+              <!-- 浣嶇疆 -->
+              <el-form-item v-else-if="item.location" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+                <div class="custom-name">
+                  <span v-if="scope.row.isEdit || scope.row.editable">{{
+                    scope.row[item.prop]?.label ?? scope.row[item.prop]
+                  }}</span>
+                  <el-select
+                    v-else
+                    v-model="scope.row[item.prop]"
+                    placeholder="璇烽�夋嫨"
+                    size="mini"
+                    style="width: 80%"
+                    @change="
+                      (val) => {
+                        selLocationClick(val, item.prop)
+                      }
+                    "
+                  >
+                    <el-option
+                      v-for="(item, index) in selLocationOptions"
+                      :key="index"
+                      :label="item.name"
+                      :value="{ value: item.id, label: item.name }"
+                    >
+                    </el-option>
+                  </el-select>
+                </div>
+              </el-form-item>
+              <!-- 閲嶈璐ц鍒�-浣嶇疆 -->
+              <el-form-item
+                v-else-if="item.defaultLocation"
+                label=" "
+                :prop="'tableData.' + scope.$index + '.' + item.prop"
+              >
+                <div class="custom-name">
+                  <el-select
+                    v-if="!scope.row.isEdit && scope.row.isOrder"
+                    v-model="locacionName"
+                    placeholder="璇烽�夋嫨"
+                    size="mini"
+                    style="width: 80%"
+                    @change="
+                      (val) => {
+                        selLocationClick(val, item.prop, scope.row)
+                      }
+                    "
+                  >
+                    <el-option
+                      v-for="(ite, index) in selLocationOptions"
+                      :key="index"
+                      :label="ite.name"
+                      :value="{ value: ite.id, label: ite.name }"
+                    >
+                    </el-option>
+                  </el-select>
+                  <span v-else-if="scope.row.isEdit || scope.row.editable">{{
+                    scope.row[item.prop]?.label ?? scope.row[item.prop]
+                  }}</span>
+                </div>
+              </el-form-item>
+              <!-- 浜у搧 -->
+              <el-form-item v-else-if="item.product" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+                <div class="custom-name">
+                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span>
+                  <el-select
+                    v-else
                     v-model="scope.row[item.prop]"
                     placeholder="璇烽�夋嫨"
                     size="mini"
@@ -58,75 +217,105 @@
                     "
                   >
                     <el-option
-                      v-for="item in productNameOptions"
-                      :key="item.id"
+                      v-for="(item, index) in productNameOptions"
+                      :key="index"
                       :label="item.name"
-                      :value="{ value: item.id, label: item.name, amount: item.amount, unit: item.unit }"
+                      :value="{
+                        value: item.id,
+                        label: item.name,
+                        amount: item.amount,
+                        unit: item.unit,
+                        categoryId: item.categoryId,
+                        categoryName: item.categoryName
+                      }"
                     >
                     </el-option>
                   </el-select>
                 </div>
               </el-form-item>
+              <!-- 浜у搧绫诲瀷 -->
               <el-form-item
-                v-else-if="item.date"
+                v-else-if="item.productType"
                 label=" "
                 :prop="'tableData.' + scope.$index + '.' + item.prop"
-                :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
               >
-                <el-date-picker v-model="scope.row[item.prop]" type="date" size="mini" style="width: 110px">
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item
-                v-else-if="item.inputNumber"
-                label=" "
-                :prop="'tableData.' + scope.$index + '.' + item.prop"
-                :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
-              >
-                <el-input-number
-                  v-model="scope.row[item.prop]"
-                  placeholder=""
-                  :min="0"
-                  :controls="false"
-                  size="mini"
-                  style="width: 100%; margin-right: 5px"
-                  @change="
-                    (val) => {
-                      commonInputChange(val, item.prop, scope.row)
-                    }
-                  "
-                ></el-input-number>
-              </el-form-item>
-              <el-form-item
-                v-else-if="item.inputFloat"
-                label=" "
-                :prop="'tableData.' + scope.$index + '.' + item.prop"
-                :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
-              >
-                <el-input-number
-                  v-model="scope.row[item.prop]"
-                  placeholder=""
-                  :min="0"
-                  :precision="2"
-                  :controls="false"
-                  size="mini"
-                  style="width: 100%; margin-right: 5px"
-                  @change="
-                    (val) => {
-                      commonInputChange(val, item.prop, scope.row)
-                    }
-                  "
-                ></el-input-number>
-              </el-form-item>
-              <el-form-item v-else-if="item.select" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
                 <div class="custom-name">
+                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span>
                   <el-select
+                    v-else
                     v-model="scope.row[item.prop]"
                     placeholder="璇烽�夋嫨"
                     size="mini"
-                    style="width: 63%"
+                    style="width: 80%"
+                    @change="
+                      (val) => {
+                        selProductTypeClick(val)
+                      }
+                    "
+                  >
+                    <el-option
+                      v-for="item in productTypeNameOptions"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="{
+                        value: item.id,
+                        label: item.name
+                      }"
+                    >
+                    </el-option>
+                  </el-select>
+                </div>
+              </el-form-item>
+              <!-- 鐢ㄦ埛 -->
+              <el-form-item v-else-if="item.user" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+                <div class="custom-name">
+                  <span>{{ "绠＄悊鍛�" }}</span>
+                  <!-- <el-select
+                    v-else
+                    v-model="scope.row[item.prop]"
+                    placeholder="璇烽�夋嫨"
+                    size="mini"
+                    style="width: 80%"
                     @change="selCommonClick"
                   >
-                    <el-option v-for="item in selOptions" :key="item.id" :label="item.name" :value="item"> </el-option>
+                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.name" :value="item.name">
+                    </el-option>
+                  </el-select> -->
+                </div>
+              </el-form-item>
+              <!-- 璺嚎 -->
+              <el-form-item v-else-if="item.route" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+                <div class="custom-name">
+                  <span v-if="scope.row.isEdit">{{ scope.row[item.prop]?.label ?? scope.row[item.prop] }}</span>
+                  <el-select
+                    v-else
+                    v-model="scope.row[item.prop]"
+                    placeholder="璇烽�夋嫨"
+                    size="mini"
+                    style="width: 80%"
+                    @change="
+                      (val) => {
+                        selRouteClick(val, item.prop)
+                      }
+                    "
+                  >
+                    <el-option
+                      v-for="(item, index) in selRouteOptions"
+                      :key="index"
+                      :label="item.name"
+                      :value="{ value: item.id, label: item.name }"
+                    >
+                    </el-option>
+                  </el-select>
+                </div>
+              </el-form-item>
+              <!-- 鍏徃 -->
+              <el-form-item v-else-if="item.company" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+                <div class="custom-name">
+                  <span v-if="scope.row.isEdit">{{ scope.row[item.prop] }}</span>
+                  <el-select v-else v-model="scope.row[item.prop]" placeholder="璇烽�夋嫨" size="mini" style="width: 80%">
+                    <el-option v-for="(item, index) in companyOptions" :key="index" :label="item.name" :value="item">
+                    </el-option>
                   </el-select>
                 </div>
               </el-form-item>
@@ -138,7 +327,7 @@
         <slot name="tableButton" />
       </el-table>
     </el-form>
-    <div v-if="!detailEnter" style="margin: 10px">
+    <div v-if="!detailEnter && !isinventory && !islistingrules && !isReorder" style="margin: 10px">
       <el-button size="small" type="primary" @click="add">娣诲姞鏄庣粏琛�</el-button>
       <!-- <el-button size="small" type="primary" @click="empty">娓呯┖</el-button> -->
     </div>
@@ -154,10 +343,16 @@
 
 <script>
 import { getProductList } from "@/api/product/product"
+import { getLocationList } from "@/api/warehouseManage/warehouse"
+import { getCompanyList } from "@/api/common/other"
+import { getRuleList } from "@/api/operate/inventoryAdjustment"
+import { getProductCategoryList } from "@/api/product/productCategory"
+import SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
+import { getAmountAndPrediction } from "@/api/product/reorderRules"
 // import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
 export default {
   name: "CommmonFormTableView",
-  components: {},
+  components: { SimpleSearchInput },
   props: {
     detailEnter: {
       type: Boolean,
@@ -171,6 +366,8 @@
       type: Object,
       default: () => {
         return {
+          selectBox: false,
+          selectIndex: false,
           tableData: [], // 鎺ュ彛杩斿洖鏁版嵁
           tableColumn: [
             // table琛ㄥ崟
@@ -178,6 +375,18 @@
           ]
         }
       }
+    },
+    isinventory: {
+      type: Boolean,
+      default: false
+    },
+    islistingrules: {
+      type: Boolean,
+      default: false
+    },
+    isReorder: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -192,14 +401,35 @@
       },
       productIndex: 0,
       productNameOptions: [],
+      productTypeNameOptions: [],
+      memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
       selOptions: [
         { id: 1, name: "浠�" },
         { id: 2, name: "鎵�" }
-      ]
+      ],
+      selLocationOptions: [], // 浣嶇疆
+      companyOptions: [], // 鍏徃
+      selRouteOptions: [{ id: 1, name: "鍒堕��" }], // 璺嚎
+      locacionName: "",
+      locacionId: 0,
+      productName: "",
+      productId: ""
     }
   },
   created() {
-    this.getProductList()
+    if (this.isinventory) {
+      this.getRuleList()
+    } else if (this.isReorder) {
+      this.getProductList()
+      this.getLocationList()
+    } else {
+      this.getProductList()
+      this.getProductCategoryList()
+    }
+    if (this.islistingrules) {
+      this.getLocationList()
+      // this.getCompanyList()
+    }
     this.tableList = this.productTableList
   },
   computed: {},
@@ -223,19 +453,171 @@
         }
       })
     },
-    // 閫夋嫨浜у搧
-    selProductClick(item) {
-      this.tableList.tableData.map((ite) => {
-        if (ite.productName.label === item.label) {
-          ite.productId = item.value
-          ite.productName = item.label
-          ite.amount = item.amount
-          ite.unit = item.unit
+    // 搴撳瓨璋冩暣鑾峰彇浣嶇疆鍜屼骇鍝�
+    async getRuleList() {
+      await getRuleList({
+        locationId: 0,
+        productId: ""
+      }).then((res) => {
+        console.log(res)
+        if (res.code === 200) {
+          const list = res.data ? res.data : []
+          this.selLocationOptions = list.locationList
+          this.productNameOptions = list.productList
         }
+      })
+    },
+    // 鑾峰彇浜у搧绫诲瀷鍒楄〃
+    async getProductCategoryList() {
+      await getProductCategoryList({
+        categoryId: 0,
+        keyWord: "",
+        page: 1,
+        pageSize: 15
+      }).then((res) => {
+        console.log(res, "鐪嬬湅浜у搧绫诲瀷鍒楄〃")
+        if (res.code === 200) {
+          const list = res.data ? res.data : []
+          this.productTypeNameOptions = list
+        }
+      })
+    },
+    // 浣嶇疆
+    async getLocationList() {
+      await getLocationList({
+        keyword: "",
+        page: 1,
+        pageSize: 100
+      }).then((res) => {
+        if (res.code === 200) {
+          const list = res.data ? res.data : []
+          this.selLocationOptions = list
+          if (this.isReorder) {
+            this.locacionName = list[0]?.name
+            this.locacionId = list[0]?.id
+            this.$emit("selLocationClick", list[0], "locacionName")
+          }
+        }
+      })
+    },
+    // 鑾峰彇鍏徃鍒楄〃
+    async getCompanyList() {
+      await getCompanyList().then((res) => {
+        console.log(res)
+        if (res.code === 200) {
+          this.companyOptions = res.data
+        }
+      })
+    },
+    selProductNameClick(item) {
+      console.log(item)
+      this.tableList.tableData.map((ite) => {
+        console.log(ite)
+        // if (ite.productName === item.name) {
+        ite.productId = item.id
+        ite.productName = item.name
+        ite.amount = item.amount
+        ite.unit = item.unit
+        // }
       })
       console.log(this.tableList.tableData)
     },
-    // 閫夋嫨鍗曚綅
+    // 閫夋嫨浜у搧
+    selProductClick(item) {
+      if (this.isReorder) {
+        this.productId = item.value
+        this.productName = item.label
+        this.getAmountAndPrediction(item, "product")
+      } else {
+        this.tableList.tableData.map((ite) => {
+          if (ite.productName.label === item.label) {
+            ite.productId = item.value
+            ite.productName = item.label
+            ite.categoryId = item.categoryId
+            ite.productCategory = item.categoryName
+            ite.amount = item.amount
+            ite.unit = item.unit
+          }
+        })
+      }
+
+      if (this.isinventory) {
+        getRuleList({
+          locationId: 0,
+          productId: item.value
+        }).then((res) => {
+          console.log(res)
+          if (res.code === 200) {
+            const list = res.data ? res.data : []
+            this.selLocationOptions = list.locationList
+          }
+        })
+      }
+      console.log(this.tableList.tableData)
+      this.$emit("selProductClick", item)
+    },
+    // 閫夋嫨浜у搧绫诲瀷
+    selProductTypeClick(item) {
+      this.tableList.tableData.map((ite) => {
+        if (ite.productCategory.label === item.label) {
+          ite.productCategoryId = item.value
+          ite.productCategory = item.label
+        }
+      })
+      if (this.isinventory) {
+        this.getProductCategoryList()
+      }
+      this.$emit("selProductTypeClick", item)
+    },
+    // 閫夋嫨浣嶇疆
+    selLocationClick(item, prop, row) {
+      if (this.isReorder) {
+        if (this.productId !== 0) {
+          this.getAmountAndPrediction(row, "location", item)
+        }
+      }
+      if (this.isinventory) {
+        getRuleList({
+          locationId: item.value,
+          productId: ""
+        }).then((res) => {
+          console.log(res)
+          if (res.code === 200) {
+            const list = res.data ? res.data : []
+            this.productNameOptions = list.productList
+          }
+        })
+      }
+      this.$emit("selLocationClick", item, prop)
+    },
+    // 鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲�
+    getAmountAndPrediction(item, val, ite) {
+      console.log(item, val, ite)
+      console.log(this.productName)
+      console.log(this.tableList.tableData)
+      if (this.productName.length > 0) {
+        getAmountAndPrediction({
+          locationId: val === "product" ? this.locacionId : ite.value,
+          productId: val === "product" ? item.value : this.productId
+        }).then((res) => {
+          if (res.code === 200) {
+            this.tableList.tableData.map((ite) => {
+              if (ite.productName.label === this.productName) {
+                ite.amount = res.data.amount
+                ite.prediction = res.data.prediction
+                ite.unit = item.unit
+              }
+            })
+          }
+        })
+      }
+    },
+    // 閫夋嫨璺嚎
+    selRouteClick(item, prop) {
+      console.log("33333333333333")
+      this.$emit("selRouteClick", item, prop)
+    },
+    // 閫夋嫨鍗曚綅/鐢ㄦ埛
     selCommonClick(item) {
       console.log(item)
     },
@@ -320,22 +702,42 @@
         return true
       }
       this.tableList.tableData.splice(scope.$index, 1)
-    }
+    },
+    // 琛岀偣鍑�
+    tableRowClick(row) {
+      this.$emit("tableRowClick", row, row.index)
+    },
+    // 鍗曢�夎鐩稿叧
+    tableRowClassName({ row, rowIndex }) {
+      row.index = rowIndex
+    },
+    setFormItem(val) {
+      console.log(val)
+    },
+    commoInput() {}
   }
 }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
+.setHeight {
+  height: 100%;
+}
 .page-view {
   min-width: 100px;
+
   .el-form-item {
     margin-bottom: 0;
     .custom-name {
       display: flex;
+      justify-content: center;
+      font-size: 12px;
+      line-height: 17px;
+      font-family: PingFangSC;
       .common-select-btn {
         margin-left: 5px;
-        font-size: 18px;
+        font-size: 13px;
         cursor: pointer;
       }
     }
@@ -345,20 +747,38 @@
   .el-form-item__label {
     display: none;
   }
+  .el-form-item__content {
+    // height: 28px; /* 璁剧疆楂樺害 */
+    line-height: 22px; /* 璁剧疆琛岄珮 */
+  }
   .el-table__footer-wrapper tbody td.el-table__cell {
     background-color: #fff;
     // text-align: right;
     font-weight: bold;
   }
-  .el-input--suffix .el-input__inner {
-    padding-right: 0px;
-  }
   .el-table .cell,
   .el-table th.el-table__cell > .cell {
     padding: 0 5px;
   }
-  .el-input__inner {
-    text-align: left;
+  // .el-input__inner {
+  //   text-align: left;
+  // }
+}
+
+::v-deep .el-table .cell {
+  font-size: 12px;
+  line-height: 17px;
+  font-family: PingFangSC;
+  color: rgba(0, 0, 0, 0.9);
+  .el-button--text {
+    width: auto;
+    height: auto;
+    font-family: PingFangSC-Medium, sans-serif;
   }
 }
+::v-deep .el-table .el-table__cell {
+  padding: 6px 0 !important;
+  height: 35px;
+  text-align: center;
+}
 </style>

--
Gitblit v1.8.0