仓库增加格数及对应功能修改，库存子表不管到把的唯一编码存储刀具编码

cuijian

2 天以前 33f721fc0a4bc40679bff4983aeb5d7edb821705

 src/views/tms/modules/baseTools/ParaBladeModal.vue

@@ -5,122 +5,181 @@
    :visible="visible"
    centered
    :confirmLoading="confirmLoading"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    cancelText="关闭"
  >
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 工具基础信息
        <a-divider orientation="center" style="font-size: large; font-style: italic; color: #66aeed">
          工具基础信息
        </a-divider>

        <a-row :gutter="24">
              <a-col :span="6">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="classifyNum" label="工具分类编码">
                      <a-input placeholder="请输入工具分类编码" v-model="model.classifyNum" :disabled="true" />
                    </a-form-model-item>
                  </a-col>
                </a-row>
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="classifyName" label="工具分类名称">
                      <a-input placeholder="请输入工具分类名称" v-model="model.classifyName"  :disabled="true" />
                    </a-form-model-item>
                  </a-col>
                </a-row>
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="toolCode" label="工具编码">
                      <a-input :placeholder="disableSubmit?'':'请输入工具编码'" v-model="model.toolCode" :disabled="disableSubmit"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-col>

              <a-col :span="6">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="chineseName"
                                      label="中文名称">
                      <a-input :placeholder="disableSubmit?'':'请输入中文名称'" v-model="model.chineseName" :disabled="disableSubmit"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
                 <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="foreignLanguageName"
                                      label="外文名称">
                      <a-input :placeholder="disableSubmit?'':'请输入外文名称'" v-model="model.foreignLanguageName" :disabled="disableSubmit" />
                    </a-form-model-item>
                  </a-col>
                </a-row>
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="toolModel"
                                      label="型号/图号">
                      <a-input :placeholder="disableSubmit?'':'请输入型号/图号'" v-model="model.toolModel" :disabled="disableSubmit" />
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-col>

              <a-col :span="6">
              <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="standardLevel"
                                      label="标注级别">
                      <a-input :placeholder="disableSubmit?'':'请输入标准级别'" v-model="model.standardLevel" :disabled="disableSubmit"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
                 <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="standardCode" label="标准号">
                      <a-input :placeholder="disableSubmit?'':'请输入标准号'" v-model="model.standardCode" :disabled="disableSubmit"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="signCode" label="序号">
                      <a-input :placeholder="disableSubmit?'':'请输入序号'" v-model="model.signCode" :disabled="disableSubmit"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-col>

              <a-col :span="6">
                 <a-row>
                  <a-col :span="24">
                    <a-form-model-item label='' :labelCol='labelCol' :wrapperCol='wrapperCol'>
                      <j-image-upload text='上传图片' v-model='model.toolPicture'></j-image-upload>
                    </a-form-model-item>
                  </a-col>
                 </a-row>
              </a-col>
            </a-row>

        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 管理参数
        </a-divider>

        <a-row :gutter="24">
           <a-col :span="8">
                <a-form-model-item prop="applicationType"
                                   label="工具类型">
                  <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'请选择工具类型'"
                                     v-model="model.applicationType" :disabled="disableSubmit" />
          <a-col :span="6">
            <a-row>
              <a-col :span="24">
                <a-form-model-item prop="classifyNum" label="工具分类编码">
                  <a-input placeholder="请输入工具分类编码" v-model="model.classifyNum" :disabled="true" />
                </a-form-model-item>
              </a-col>
           <a-col :span="8">
            <a-form-model-item prop="provinceCity" label="仓库省份城市">
              <a-input :placeholder="disableSubmit?'':'请输入仓库省份城市'" v-model="model.provinceCity" :disabled="disableSubmit"/>
            </a-row>
            <a-row>
              <a-col :span="24">
                <a-form-model-item prop="classifyName" label="工具分类名称">
                  <a-input placeholder="请输入工具分类名称" v-model="model.classifyName" :disabled="true" />
                </a-form-model-item>
              </a-col>
            </a-row>
            <a-row>
              <a-col :span="24">
                <a-form-model-item prop="toolCode" label="工具编码">
                  <a-input
                    :placeholder="disableSubmit ? '' : '请输入工具编码'"
                    v-model="model.toolCode"
                    :disabled="disableSubmit"
                  />
                </a-form-model-item>
              </a-col>
            </a-row>
            <a-row>
              <a-col :span="24">
                <a-form-model-item prop="accuracyClass" label="精度等级">
                  <j-dict-select-tag
                    :disabled="disableSubmit"
                    type="list"
                    v-model="model.accuracyClass"
                    :triggerChange="true"
                    dictCode="accuracy_class"
                    :placeholder="disableSubmit ? '' : '请选择精度等级'"
                  />
                </a-form-model-item>
              </a-col>
            </a-row>
          </a-col>

          <a-col :span="6">
            <a-row>
              <a-col :span="24">
                <a-form-model-item prop="chineseName" label="中文名称">
                  <a-input
                    :placeholder="disableSubmit ? '' : '请输入中文名称'"
                    v-model="model.chineseName"
                    :disabled="disableSubmit"
                  />
                </a-form-model-item>
              </a-col>
            </a-row>
            <a-row>
              <a-col :span="24">
                <a-form-model-item prop="foreignLanguageName" label="外文名称">
                  <a-input
                    :placeholder="disableSubmit ? '' : '请输入外文名称'"
                    v-model="model.foreignLanguageName"
                    :disabled="disableSubmit"
                  />
                </a-form-model-item>
              </a-col>
            </a-row>
            <a-row>
              <a-col :span="24">
                <a-form-model-item prop="toolModel" label="型号/图号">
                  <a-input
                    :placeholder="disableSubmit ? '' : '请输入型号/图号'"
                    v-model="model.toolModel"
                    :disabled="disableSubmit"
                  />
                </a-form-model-item>
              </a-col>
            </a-row>
          </a-col>

          <a-col :span="6">
            <a-row>
              <a-col :span="24">
                <a-form-model-item prop="standardLevel" label="标注级别">
                  <a-input
                    :placeholder="disableSubmit ? '' : '请输入标准级别'"
                    v-model="model.standardLevel"
                    :disabled="disableSubmit"
                  />
                </a-form-model-item>
              </a-col>
            </a-row>
            <a-row>
              <a-col :span="24">
                <a-form-model-item prop="standardCode" label="标准号">
                  <a-input
                    :placeholder="disableSubmit ? '' : '请输入标准号'"
                    v-model="model.standardCode"
                    :disabled="disableSubmit"
                  />
                </a-form-model-item>
              </a-col>
            </a-row>
            <a-row>
              <a-col :span="24">
                <a-form-model-item prop="signCode" label="序号">
                  <a-input
                    :placeholder="disableSubmit ? '' : '请输入序号'"
                    v-model="model.signCode"
                    :disabled="disableSubmit"
                  />
                </a-form-model-item>
              </a-col>
            </a-row>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="accuracyClass" label="精度等级">
              <j-dict-select-tag
                type="list"
                v-model="model.accuracyClass"
                :triggerChange="true"
                dictCode="accuracy_class"
                :placeholder="disableSubmit ? '' : '请选择精度等级'"
              />
            </a-form-model-item>
          </a-col>

          <a-col :span="6">
            <a-row>
              <a-col :span="24">
                <a-form-model-item label="" :labelCol="labelCol" :wrapperCol="wrapperCol">
                  <j-image-upload text="上传图片" v-model="model.toolPicture"></j-image-upload>
                </a-form-model-item>
              </a-col>
            </a-row>
          </a-col>
        </a-row>

        <a-divider orientation="center" style="font-size: large; font-style: italic; color: #66aeed">
          管理参数
        </a-divider>

        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="applicationType" label="工具类型">
              <j-dict-select-tag
                dict-code="equipment_category"
                :placeholder="disableSubmit ? '' : '请选择工具类型'"
                v-model="model.applicationType"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="positionCode" label="库位号">
            <a-form-model-item prop="provinceCity" label="仓库省份城市">
              <a-input
                :placeholder="disableSubmit ? '' : '请输入仓库省份城市'"
                v-model="model.provinceCity"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <!-- <a-form-model-item prop="positionCode" label="库位号">
              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="库位号">
             <a-select
                :disabled="disableSubmit"
@@ -129,6 +188,16 @@
                v-model="model.positionCode"
              />
            </a-form-item>
            </a-form-model-item> -->
            <a-form-model-item label="库位" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-tooltip title="选择库位后，此类刀具默认存储到此库位，请慎重选择！" placement="topRight">
                <a-input-search
                  v-model="model.positionCode"
                  @search="positionCodeSearch"
                  enter-button
                  placeholder="请选择库位"
                />
              </a-tooltip>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -136,17 +205,29 @@
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="storageLocation" label="存储位置">
              <a-input :placeholder="disableSubmit?'':'请输入存储位置'" v-model="model.storageLocation" :disabled="disableSubmit"/>
              <a-input
                :placeholder="disableSubmit ? '' : '请输入存储位置'"
                v-model="model.storageLocation"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="lowerInventory" label="最低库存">
              <a-input :placeholder="disableSubmit?'':'请输入最低库存'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
              <a-input
                :placeholder="disableSubmit ? '' : '请输入最低库存'"
                v-model="model.lowerInventory"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="highestInventory" label="最高库存">
              <a-input :placeholder="disableSubmit?'':'请输入最高库存'" v-model="model.highestInventory" :disabled="disableSubmit"/>
              <a-input
                :placeholder="disableSubmit ? '' : '请输入最高库存'"
                v-model="model.highestInventory"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -154,7 +235,11 @@
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="auxiliaryUnitFlag" label="是否有计量辅单位">
              <a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'请选择是否有计量辅单位'" :disabled="disableSubmit">
              <a-radio-group
                v-model="model.auxiliaryUnitFlag"
                :placeholder="disableSubmit ? '' : '请选择是否有计量辅单位'"
                :disabled="disableSubmit"
              >
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
@@ -162,25 +247,41 @@
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="mainUnit" label="计量主单位">
              <a-input :placeholder="disableSubmit?'':'请输入计量主单位'" v-model="model.mainUnit" :disabled="disableSubmit"/>
              <a-input
                :placeholder="disableSubmit ? '' : '请输入计量主单位'"
                v-model="model.mainUnit"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="auxiliaryUnit" label="计量辅单位">
              <a-input :placeholder="disableSubmit?'':'请输入计量辅单位'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
              <a-input
                :placeholder="disableSubmit ? '' : '请输入计量辅单位'"
                v-model="model.auxiliaryUnit"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>

         <a-row :gutter="24">
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="supplierId" label="厂家">
              <a-input :placeholder="disableSubmit?'':'请输入厂家'" v-model="model.supplierId" :disabled="disableSubmit"/>
              <a-input
                :placeholder="disableSubmit ? '' : '请输入厂家'"
                v-model="model.supplierId"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="price" label="单价">
              <a-input :placeholder="disableSubmit?'':'请输入单价'" v-model="model.price" :disabled="disableSubmit"/>
              <a-input
                :placeholder="disableSubmit ? '' : '请输入单价'"
                v-model="model.price"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
          <!-- <a-col :span="8">
@@ -190,28 +291,45 @@
          </a-col> -->
        </a-row>

        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 参数信息
        <a-divider orientation="center" style="font-size: large; font-style: italic; color: #66aeed">
          参数信息
        </a-divider>

        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="刀片形状" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
              <a-input v-model="model.bladeShape" :placeholder="disableSubmit?'':'请输入刀片形状'"  :disabled="disableSubmit"></a-input>
              <a-input
                v-model="model.bladeShape"
                :placeholder="disableSubmit ? '' : '请输入刀片形状'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀片长度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeLength">
              <a-input v-model="model.bladeLength" :placeholder="disableSubmit?'':'请输入刀片长度'"  :disabled="disableSubmit"></a-input>
              <a-input
                v-model="model.bladeLength"
                :placeholder="disableSubmit ? '' : '请输入刀片长度'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="切削刃数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeCount">
              <a-input v-model="model.cuttingEdgeCount" :placeholder="disableSubmit?'':'请输入切削刃数'"  :disabled="disableSubmit"></a-input>
              <a-input
                v-model="model.cuttingEdgeCount"
                :placeholder="disableSubmit ? '' : '请输入切削刃数'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
           <a-col :span="6">
          <a-col :span="6">
            <a-form-model-item label="刀片厚度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeThickness">
              <a-input v-model="model.bladeThickness" :placeholder="disableSubmit?'':'请输入刀片厚度'"  :disabled="disableSubmit"></a-input>
              <a-input
                v-model="model.bladeThickness"
                :placeholder="disableSubmit ? '' : '请输入刀片厚度'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -219,137 +337,239 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item label="夹固型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingType">
              <a-input v-model="model.clampingType" :placeholder="disableSubmit?'':'请输入夹固型式'"  :disabled="disableSubmit"></a-input>
              <a-input
                v-model="model.clampingType"
                :placeholder="disableSubmit ? '' : '请输入夹固型式'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀尖R" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noseAngleR">
              <a-input v-model="model.noseAngleR" :placeholder="disableSubmit?'':'请输入刀尖R'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.noseAngleR"
                :placeholder="disableSubmit ? '' : '请输入刀尖R'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀片材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'请输入刀片材料'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.toolMaterial"
                :placeholder="disableSubmit ? '' : '请输入刀片材料'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="零件材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
              <a-input v-model="model.partMaterial" :placeholder="disableSubmit?'':'请输入零件材料'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.partMaterial"
                :placeholder="disableSubmit ? '' : '请输入零件材料'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group v-model="model.paintcoatFlag" :placeholder="disableSubmit?'':'请选择是否涂层'" :disabled="disableSubmit">
              <a-radio-group
                v-model="model.paintcoatFlag"
                :placeholder="disableSubmit ? '' : '请选择是否涂层'"
                :disabled="disableSubmit"
              >
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="附加技术条件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="technicalConditions">
              <a-input v-model="model.technicalConditions" :placeholder="disableSubmit?'':'请输入附加技术条件'" :disabled="disableSubmit" ></a-input>
            <a-form-model-item
              label="附加技术条件"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="technicalConditions"
            >
              <a-input
                v-model="model.technicalConditions"
                :placeholder="disableSubmit ? '' : '请输入附加技术条件'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="附加技术条件说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionsInfo">
              <a-input v-model="model.conditionsInfo" :placeholder="disableSubmit?'':'请输入附加技术条件说明'" :disabled="disableSubmit" ></a-input>
            <a-form-model-item
              label="附加技术条件说明"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="conditionsInfo"
            >
              <a-input
                v-model="model.conditionsInfo"
                :placeholder="disableSubmit ? '' : '请输入附加技术条件说明'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="涂层材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coatingMaterial">
              <a-input v-model="model.coatingMaterial" :placeholder="disableSubmit?'':'请输入涂层材质'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.coatingMaterial"
                :placeholder="disableSubmit ? '' : '请输入涂层材质'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
              <a-input v-model="model.brand" :placeholder="disableSubmit?'':'请输入品牌'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.brand"
                :placeholder="disableSubmit ? '' : '请输入品牌'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="制式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
              <a-input v-model="model.types" :placeholder="disableSubmit?'':'请输入制式'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.types"
                :placeholder="disableSubmit ? '' : '请输入制式'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="加工分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processingClassify">
              <a-input v-model="model.processingClassify" :placeholder="disableSubmit?'':'请输入加工分类'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.processingClassify"
                :placeholder="disableSubmit ? '' : '请输入加工分类'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀片后角" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladePosterior">
              <a-input v-model="model.bladePosterior" :placeholder="disableSubmit?'':'请输入刀片后角'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.bladePosterior"
                :placeholder="disableSubmit ? '' : '请输入刀片后角'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item label="切削方向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
              <a-input v-model="model.cuttingDirection" :placeholder="disableSubmit?'':'请输入切削方向'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.cuttingDirection"
                :placeholder="disableSubmit ? '' : '请输入切削方向'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀片宽度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeWide">
              <a-input v-model="model.bladeWide" :placeholder="disableSubmit?'':'请输入刀片宽度'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.bladeWide"
                :placeholder="disableSubmit ? '' : '请输入刀片宽度'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="刀片尺寸" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeSize">
              <a-input v-model="model.bladeSize" :placeholder="disableSubmit?'':'请输入刀片尺寸'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.bladeSize"
                :placeholder="disableSubmit ? '' : '请输入刀片尺寸'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="内外螺纹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inOutThread">
              <a-input v-model="model.inOutThread" :placeholder="disableSubmit?'':'请输入内外螺纹'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.inOutThread"
                :placeholder="disableSubmit ? '' : '请输入内外螺纹'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
            <a-form-model-item label="螺纹标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
              <a-input v-model="model.threadStandard" :placeholder="disableSubmit?'':'请输入螺纹标准'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.threadStandard"
                :placeholder="disableSubmit ? '' : '请输入螺纹标准'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="牙型角度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dentalAngle">
              <a-input v-model="model.dentalAngle" :placeholder="disableSubmit?'':'请输入牙型角度'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.dentalAngle"
                :placeholder="disableSubmit ? '' : '请输入牙型角度'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="螺距" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
              <a-input v-model="model.pitch" :placeholder="disableSubmit?'':'请输入螺距'" :disabled="disableSubmit" ></a-input>
              <a-input
                v-model="model.pitch"
                :placeholder="disableSubmit ? '' : '请输入螺距'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item label="最小加工内螺纹公称直径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="minInternalThread">
              <a-input v-model="model.minInternalThread" :placeholder="disableSubmit?'':'请输入最小加工内螺纹公称直径'" :disabled="disableSubmit" ></a-input>
            <a-form-model-item
              label="最小加工内螺纹公称直径"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="minInternalThread"
            >
              <a-input
                v-model="model.minInternalThread"
                :placeholder="disableSubmit ? '' : '请输入最小加工内螺纹公称直径'"
                :disabled="disableSubmit"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="备注">
              <a-textarea :placeholder="disableSubmit?'':'请输入备注'" v-model="model.remark" :disabled="disableSubmit"/>
              <a-textarea
                :placeholder="disableSubmit ? '' : '请输入备注'"
                v-model="model.remark"
                :disabled="disableSubmit"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </a-spin>
    <select-position-code-modal ref="selectPositionCodeModal" :title="'选择库位'" />
  </j-modal>
</template>

<script>
import { getAction,postAction, httpAction } from '@/api/manage'
import { getAction, postAction, httpAction } from '@/api/manage'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
import { duplicateCheck } from '@/api/api'//重复校验
import { duplicateCheck } from '@/api/api' //重复校验
import { ajaxGetDictItems } from '@/api/api'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import SelectPositionCodeModal from './SelectPositionCodeModal'

export default {
  name: 'ParaHoleToolsModal',
  components: { JSelectProduction },
  components: { JSelectProduction, JDictSelectTag, SelectPositionCodeModal },
  data() {
    return {
      title: '操作',
@@ -361,86 +581,64 @@
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 9 }
        sm: { span: 9 },
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 14 }
        sm: { span: 14 },
      },
      labelColLong: {
        xs: { span: 24 },
        sm: { span: 2 }
        sm: { span: 2 },
      },
      wrapperColLong: {
        xs: { span: 24 },
        sm: { span: 22 }
        sm: { span: 22 },
      },
      confirmLoading: false,
      validatorRules: {
        toolCode: [
          { required: true, message: '请输入工具编码' },
          { validator: this.validateNum }
        ],
        classifyNum: [
          { required: true, message: '请输入工具分类编码' }
        ],
        classifyName: [
          { required: true, message: '请输入工具分类名称' }
        ],
        toolModel: [
          { required: true, message: '请输入型号/图号' },
           { validator: this.validateModel }
        ],
        chineseName: [
          { required: true, message: '请输入中文名称' }
        ],
        bladeShape: [
          { required: true, message: '请输入刀片形状' }
        ],
        bladeLength: [
          { required: true, message: '请输入刀片长度' }
        ],
        cuttingEdgeCount: [
          { required: true, message: '请输入切削刃数' }
        ],
        bladeThickness: [
          { required: true, message: '请输入刀片厚度' }
        ],
        clampingType: [
          { required: true, message: '请输入夹固型式' }
        ],
         noseAngleR: [
          { required: true, message: '请输入刀尖R' }
        ],
        toolMaterial: [
          { required: true, message: '请输入刀片材料' }
        ],
        paintcoatFlag: [
          { required: true, message: '请选择是否涂层' }
        ],
        technicalConditions: [
          { required: true, message: '请输入附加技术条件' }
        ]
        accuracyClass: [{ required: true, message: '请选择精度等级' }],
        toolCode: [{ required: true, message: '请输入工具编码' }, { validator: this.validateNum }],
        classifyNum: [{ required: true, message: '请输入工具分类编码' }],
        classifyName: [{ required: true, message: '请输入工具分类名称' }],
        toolModel: [{ required: true, message: '请输入型号/图号' }, { validator: this.validateModel }],
        chineseName: [{ required: true, message: '请输入中文名称' }],
        bladeShape: [{ required: true, message: '请输入刀片形状' }],
        bladeLength: [{ required: true, message: '请输入刀片长度' }],
        cuttingEdgeCount: [{ required: true, message: '请输入切削刃数' }],
        bladeThickness: [{ required: true, message: '请输入刀片厚度' }],
        clampingType: [{ required: true, message: '请输入夹固型式' }],
        noseAngleR: [{ required: true, message: '请输入刀尖R' }],
        toolMaterial: [{ required: true, message: '请输入刀片材料' }],
        paintcoatFlag: [{ required: true, message: '请选择是否涂层' }],
        technicalConditions: [{ required: true, message: '请输入附加技术条件' }],
      },
      url: {
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
      locationCodeOptions:[]
      locationCodeOptions: [],
    }
  },
  created() {
     ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
        if (res.success) {
          this.locationCodeOptions = res.result
        }
      })
    ajaxGetDictItems('tms_goods_shelves,location_code,id', null).then((res) => {
      if (res.success) {
        this.locationCodeOptions = res.result
      }
    })
  },
  mounted() {
    this.$bus.$on('selectionRows', (data) => {
      this.model.positionCode = data[0].positionCode
    })
  },
  methods: {
    add(nodeSelected) {
      this.editable = false;
      this.editable = false
      //初始化默认值
      this.model = {};
      this.model = {
        positionCode: '' 
      };
      this.model.classifyId = nodeSelected.key
      this.model.classifyNum = nodeSelected.entity.classifyId
      this.model.classifyName = nodeSelected.entity.typeName
@@ -448,7 +646,7 @@
      this.visible = true
    },
    edit(record) {
      this.editable = true;
      this.editable = true
      this.model = Object.assign({}, record)
      this.visible = true
    },
@@ -457,25 +655,32 @@
      this.visible = false
      this.$refs.form.clearValidate()
    },
    positionCodeSearch() {
      let positionCode = []
      positionCode.push(this.model.positionCode)
      this.$refs.selectPositionCodeModal.showModal(positionCode)
      this.$refs.selectPositionCodeModal.title = '选择库位'
      this.$refs.selectPositionCodeModal.disableSubmit = false
    },
    handleOk() {
      const that = this
      // 触发表单验证
      this.$refs.form.validate(valid => {
      this.$refs.form.validate((valid) => {
        if (valid) {
          that.confirmLoading = true
          let formData = Object.assign(this.model)
          let httpUrl = ''
            let method = 'post'
            if (!this.model.id) {
              httpUrl += this.url.add
            } else {
              httpUrl += this.url.edit
            }
           httpAction(httpUrl, formData, method)
          let method = 'post'
          if (!this.model.id) {
            httpUrl += this.url.add
          } else {
            httpUrl += this.url.edit
          }
          httpAction(httpUrl, formData, method)
            .then((res) => {
              if (res.success) {
                that.$message.success(res.message)
               that.$emit('ok')
                that.$emit('ok')
              } else {
                that.$message.warning(res.message)
              }
@@ -490,39 +695,39 @@
    handleCancel() {
      this.close()
    },
      //验证工具编码是否重复
    //验证工具编码是否重复
    validateNum(rule, value, callback) {
      var params = {
        tableName: 'tms_base_tools',
        fieldName: 'tool_code',
        fieldVal: value,
        dataId: this.model.id
      };
        dataId: this.model.id,
      }
      duplicateCheck(params).then((res) => {
        if (res.success) {
          callback()
        } else {
          callback("工具编码已存在!")
          callback('工具编码已存在!')
        }
      })
    },
      //验证型号/图号是否重复
    //验证型号/图号是否重复
    validateModel(rule, value, callback) {
      var params = {
        tableName: 'tms_base_tools',
        fieldName: 'tool_model',
        fieldVal: value,
        dataId: this.model.id
      };
        dataId: this.model.id,
      }
      duplicateCheck(params).then((res) => {
        if (res.success) {
          callback()
        } else {
          callback("型号/图号已存在!")
          callback('型号/图号已存在!')
        }
      })
    },
  }
  },
}
</script>