Merge remote-tracking branch 'origin/master'

cuilei

10 小时以前 665c1372ff732ba6b5ae23e2c92d52b76cdf2beb

 src/views/cms/modules/RatedLifeForm.vue

@@ -5,7 +5,14 @@
        <a-row>
          <a-col :span="24">
            <a-form-model-item label="刀具编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingId">
              <a-input v-model="model.cuttingId" placeholder="请输入刀具编码"  ></a-input>
<!--              <a-input v-model="model.cuttingId" placeholder="请输入刀具编码"  ></a-input>-->
              <j-search-select-tag
                placeholder="请选择刀具编码"
                v-model="model.cuttingId"
                :remoteSearch="true"
                :async="true"
                dict="cms_cutting_tool,cutting_code,cutting_code"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="24">