Merge remote-tracking branch 'origin/master'

cuilei

2025-06-16 1b8b8bafca4fe4c3556bda5e66e3ff6252bd7acc

 src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue

@@ -17,11 +17,11 @@
                                 :disabled="disableSubmit"></j-dict-select-tag>
            </a-form-model-item>
          </a-col>


          <a-col :span="12">
            <a-form-model-item v-show="addShow" label="经手人" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="handler">
              <j-dict-select-tag dictCode="sys_user,realname,id" placeholder="请选择经手人" v-model="model.handler"
                                 :disabled="disableSubmit" />
            <a-form-model-item label="盘点名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stocktakingName">
              <a-input v-model="model.stocktakingName" placeholder="请输入盘点名称"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -31,8 +31,17 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="盘点名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stocktakingName">
              <a-input v-model="model.stocktakingName" placeholder="请输入盘点名称"></a-input>
            <a-form-model-item label="盘点时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryTime">
              <j-date placeholder="请选择盘点时间" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.inventoryTime"
                      style="width: 100%" />
            </a-form-model-item>
          </a-col>

          <a-col :span="12">
            <a-form-model-item v-show="addShow" label="经手人" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="handler">
              <j-dict-select-tag dictCode="sys_user,realname,id" placeholder="请选择经手人" v-model="model.handler"
                                 :disabled="disableSubmit" />
            </a-form-model-item>
          </a-col>

@@ -51,11 +60,12 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="盘点时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryTime">
              <j-date placeholder="请选择盘点时间" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.inventoryTime"
            <a-form-model-item  v-show="addShow" label="审核时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryTime">
              <j-date placeholder="请选择审核时间" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.approvalDate"
                      style="width: 100%" />
            </a-form-model-item>
          </a-col>

          <a-col :span="12">
            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
              <a-input v-model="model.remark" placeholder="请输入备注" type="textarea"></a-input>
@@ -159,57 +169,16 @@
        },
        {
          title: '刀具编号',
          dataIndex: 'toolCode',
          dataIndex: 'toolId',
          align: 'center',
          width: 150
          width: 180
        },

        {
          title: '工具类型',
          dataIndex: 'applicationType',
          dataIndex: 'applicationType_dictText',
          align: 'center',
          width: 150
        },

        {
          title: '中文名称',
          dataIndex: 'chineseName',
          width: 150,
          align: 'center'
        },

        {
          title: '型号/图号',
          dataIndex: 'toolModel',
          width: 150,
          align: 'center'
        },

        {
          title: '刀具材料',
          width: 150,
          dataIndex: 'toolMaterial',
          align: 'center'
        },
        {
          title: '零件材料',
          width: 150,
          dataIndex: 'partMaterial',
          align: 'center'
        },
        {
          title: '厂家',
          width: 150,
          dataIndex: 'supplierId',
          align: 'center'

        },
        {
          title: '存储位置',
          width: 150,
          dataIndex: 'goodsShelvesId',
          align: 'center'

        },
        {
          title: '账面库存',
@@ -262,6 +231,48 @@
          align: 'center',
          scopedSlots: { customRender: 'remark' }
        },
        {
          title: '中文名称',
          dataIndex: 'chineseName',
          width: 150,
          align: 'center'
        },

        {
          title: '型号/图号',
          dataIndex: 'toolModel',
          width: 150,
          align: 'center'
        },

        {
          title: '刀具材料',
          width: 150,
          dataIndex: 'toolMaterial',
          align: 'center'
        },
        {
          title: '零件材料',
          width: 150,
          dataIndex: 'partMaterial',
          align: 'center'
        },
        {
          title: '厂家',
          width: 150,
          dataIndex: 'supplierId',
          align: 'center'

        },
        {
          title: '存储位置',
          width: 150,
          dataIndex: 'goodsShelvesId',
          align: 'center'

        },


        {
          title: '操作',
          width: 150,
@@ -316,11 +327,12 @@
    this.$bus.$on('selectionRows', (data) => {
      for (let i = 0; i < data.length; i++) {
        this.dataSource.push({
          toolId: data[i].id,
          toolId: data[i].toolId,
          toolCode: data[i].toolCode,
          classifyId: data[i].classifyId,
          applicationType: data[i].applicationType_dictText,
          applicationType_dictText: data[i].applicationType_dictText,
          chineseName: data[i].chineseName,
          availableQuantity:data[i].availableCount,
          toolModel: data[i].toolModel,
          material: data[i].material,
          toolMaterial: data[i].toolMaterial,