Browse Source

no message

linwenxin 8 months ago
parent
commit
2176ef252f

+ 8 - 0
src/api/workOrderPool.js

@@ -180,6 +180,14 @@ export function orderBaseStatusCount(params) {
   })
 }
 
+export function adminWebsitWebsitList(params) {
+  return request({
+    url: `/admin/websit/websitList`,
+    method: 'post',
+    params
+  })
+}
+
 export function orderBaseStatusCount2(params) {
   return request({
     url: `/order/base/status/count2`,

+ 1 - 1
src/utils/common.js

@@ -26,7 +26,7 @@ export function addHours(str) {
 
 export function tableDataParsing(fieldBeans) {
   return fieldBeans
-    .filter(item => !item.hide && item.noUse !== true)
+    .filter(item => !item.hide)
     .map((item, index) => {
       var tiling = item.tiling || item.tiling === null || item.tiling === undefined ? true : false
       return {

+ 10 - 3
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/productColumns.js

@@ -94,9 +94,16 @@ export default {
                     }}
                     placeholder="请选择"
                   >
-                    {this.classifyList.map((item, index_) => (
-                      <el-option key={index_} label={item.name} value={item.categoryId}></el-option>
-                    ))}
+                    {this.classifyList
+                      .filter(val_ => {
+                        var v_ = this.orderInfo?.orderProducts?.find(item => item[column.columnAttributes.prop])?.[
+                          column.columnAttributes.prop
+                        ]
+                        return v_ ? val_.categoryId === v_ : true
+                      })
+                      .map((item, index_) => (
+                        <el-option key={index_} label={item.name} value={item.categoryId}></el-option>
+                      ))}
                   </el-select>
                 </el-form-item>
               </div>