Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -138,10 +138,18 @@
           >
             <span>{{ item.name }}</span>
             <a-input
-              v-if="item.type == 'input'"
+              v-if="item.type == 'input' && item.name.indexOf('名称') == -1"
               v-model:value="item.note1"
               :placeholder="'请输入' + item.name"
             />
+            <a-input
+              v-else-if="
+                item.type == 'input' && item.name.indexOf('名称') != -1
+              "
+              :maxLength="50"
+              v-model:value="item.note1"
+              :placeholder="'请输入' + item.name + '，不超过50个字符'"
+            />
             <a-radio-group
               v-else-if="item.type == 'radio'"
               v-model:value="item.note1"