Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

2 months ago · cbbaa5a41d
10 changed files with 45 additions and 35 deletions
--- a/README.md
+++ b/README.md
@ -100,7 +100,12 @@ tableForm:{
  }]
 },

-
+tableForm: {
+    type: 'InputNumber',
+    minField: 0, // 每行数据不同最小值
+    precision: 2,
+    maxField:'maxQty' // 每行数据不同最大值
+}

 **主子表合并需要修改的代码**
 1、影响Table表头
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@ -281,7 +281,7 @@ const props = defineProps({
  },
  //是否可以编辑子表
  updateTypeEdiltSubList: {
-    type: String,
+    type: Boolean,
    required: false,
    default: false
  },
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@ -148,8 +148,8 @@
              style="width: 100%"
              :key="headerItem.field + $index"
              v-model="row[headerItem.field]"
-              :max="headerItem?.tableForm?.max"
-              :min="headerItem?.tableForm?.min"
+              :max="headerItem?.tableForm?.maxField?row[headerItem?.tableForm?.maxField]:headerItem?.tableForm?.max"
+              :min="headerItem?.tableForm?.minField?row[headerItem?.tableForm?.minField]:headerItem?.tableForm?.min"
              :precision="headerItem?.tableForm?.precision"
              :disabled="itemIsDisabled(headerItem, row)"
              @change="
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@ -26,26 +26,26 @@
          </el-form-item>
        </el-col>
        <div>{{passwordConfig.ruleDesc}}</div>
-        <el-col>
-          <el-form-item label="每分钟密码输入错误" prop="tryCount">
-            <el-input-number
-              v-model="passwordConfig.tryCount"
-              :min="3"
-              :precision="0"
-              style="margin-right: 10px"
-            />次
-          </el-form-item>
-        </el-col>
-        <el-col>
-          <el-form-item label="锁定" prop="lockHours">
-            <el-input-number
-              v-model="passwordConfig.lockHours"
-              :min="1"
-              :precision="0"
-              style="margin-right: 10px"
-            />小时
-          </el-form-item>
-        </el-col>
+<!--        <el-col>-->
+<!--          <el-form-item label="每分钟密码输入错误" prop="tryCount">-->
+<!--            <el-input-number-->
+<!--              v-model="passwordConfig.tryCount"-->
+<!--              :min="3"-->
+<!--              :precision="0"-->
+<!--              style="margin-right: 10px"-->
+<!--            />次-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col>-->
+<!--          <el-form-item label="锁定" prop="lockHours">-->
+<!--            <el-input-number-->
+<!--              v-model="passwordConfig.lockHours"-->
+<!--              :min="1"-->
+<!--              :precision="0"-->
+<!--              style="margin-right: 10px"-->
+<!--            />小时-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
        <el-col>
          <el-form-item label="24小时内密码输入错误" prop="tryCount">
            <el-input-number
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@ -637,7 +637,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'action',
    isDetail: false,
    isForm: false ,
-    isTable:false,
+    isTable:true,
    table: {
      width: 150,
      fixed: 'right'
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@ -71,6 +71,9 @@
    :apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail"
    fromeWhere="countadjustRequest"
    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="true"
+    :detailButtonIsShowAddStatusArray="['1']"
    :Echo="Echo"
    @searchTableSuccessDetail="searchTableSuccessDetail"
  />
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@ -254,19 +254,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
          row['uom'] = val[0]['uom']
          row['inventoryStatus'] = val[0]['inventoryStatus']
          row['qty'] = val[0]['qty']
+          
          // 如果有批次 赋值库存余额批次 无批次 赋值 000000
          if (val[0]['batch'] !== '') {
            row['batch'] = val[0]['batch']
          } else {
            row['batch'] = '000000'
          }
-          // 修改 tableform 属性 数量最大值设置为库存余额中数量
-          // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如： 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制
-          ProductionscrapRequestDetail.allSchemas.tableFormColumns.map(item => {
-            if(item.field == 'qty' && val[0]['qty'] > 0) {
-              item.tableForm.max = val[0]['qty']
-            }
-          })
+          row['maxQty'] = val[0]['qty']
          let param = {'itemCodes':val[0]['itemCode']}
          let resyStdcost = await StdcostpriceApi.queryStdcostpriceByItemCode(param)
          console.log('resyStdcost',resyStdcost)
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@ -1807,7 +1807,8 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    tableForm: {
      type: 'InputNumber',
      min: 0,
-      precision: 2
+      precision: 2,
+      maxField:'maxQty'
    }
  },
  {
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@ -516,6 +516,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
          //   buttonOperationClick(newRow,'Bom',tableData.value.indexOf(newRow),true)
          // }
          tableData.value.push(newRow)
+          if(newRow['fromLocationCode']){
+            buttonOperationClick(newRow,'Bom',tableData.value.indexOf(newRow),true)
+          }
        })

      }else if(formField == 'bomVersion'){
@ -561,6 +564,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
            }
          }
        })
+      }else if(formField == 'workshopCode'){
+        //车间
+        setV['productionLineCode'] = ''//生产线代码
+        tableData.value = []
      }
      formRef.setValues(setV)
      if(formField == 'costCenterCode'){
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@ -435,8 +435,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
      {
        label: t('ts.创建供应商发货申请'),
        name: 'supplierdeliver',
-        hide: isShowMainButton(row, ['4']),
-        // hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty<row.planQty),
+        hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty<row.planQty),
        type: 'primary',
        icon: '',
        color: '',