汪钰 3 лет назад
Родитель
Сommit
33a1a8d1a2

Разница между файлами не показана из-за своего большого размера
+ 1 - 12766
package-lock.json


+ 1 - 1
src/main.js

@@ -10,7 +10,7 @@ import i18n from './i18n';
 import './styles/index.scss';
 import '@/components/FormGenerator/styles/index.scss';
 import DictSelection from '@/components/Dict/DictSelection';
-import tinymce from '@/components/FormGenerator/components/tinymce/index.js';
+// import tinymce from '@/components/FormGenerator/components/tinymce/index.js';
 import TinymceEditor from '@/components/TinymceEditor/index.vue';
 // import SvgIcon from '@/components/FormGenerator/components/SvgIcon'; // svg component
 

+ 24 - 24
src/views/classifyManage/itemInformation/add.vue

@@ -364,7 +364,7 @@
   } from '@/api/classifyManage/itemInformation';
   export default {
     components: { ItemForm, RowForm, AddDialog },
-    data () {
+    data() {
       return {
         pageTitle: '',
         typeList: [
@@ -427,7 +427,7 @@
         newCode: ''
       };
     },
-    created () {
+    created() {
       this.pageTitle = this.$route.query.pageTitle;
       if (this.pageTitle == '新建物品') {
         this.selectNode = JSON.parse(this.$route.query.selectNode);
@@ -465,7 +465,7 @@
       }
     },
     methods: {
-      async getOrderCode () {
+      async getOrderCode() {
         const res = await getOrderNo({ prefix: this.defaultNum });
         if (res.success) {
           this.newCode = res.data;
@@ -474,7 +474,7 @@
         }
       },
 
-      getCode (code) {
+      getCode(code) {
         this.typeList.map((item) => {
           if (item.code == code) {
             this.defaultNum = item.prefix;
@@ -484,16 +484,16 @@
       },
 
       // 在 Input 值改变时触发
-      handleEdit (e) {
+      handleEdit(e) {
         let value = e.replace(/^(0+)|[^\d]+/g, ''); // 以0开头或者输入非数字,会被替换成空
         value = value.replace(/(\d{15})\d*/, '$1'); // 最多保留15位整数
       },
-      goBack () {
+      goBack() {
         this.$router.go(-1);
       },
 
       // 获取详情
-      async getDetilInfo (id) {
+      async getDetilInfo(id) {
         const res = await getDetails({ id: id });
         if (res.success) {
           this.defaultNum = res.data.classificationCode;
@@ -539,7 +539,7 @@
       },
 
       // 改变物品类型
-      chooseItem (val) {
+      chooseItem(val) {
         if (this.currentItem && this.currentItem.prefix != val) {
           this.initItemForm();
           this.$refs.itemFormRef.$refs.formName.resetFields();
@@ -557,7 +557,7 @@
         this.setDefault(this.defaultNum);
       },
 
-      submit () {
+      submit() {
         const a1 = new Promise((resolve, reject) => {
           this.$refs.itemFormRef.validateForm((valid) => {
             if (valid) resolve();
@@ -636,7 +636,7 @@
         });
       },
 
-      handleDelete (index, row) {
+      handleDelete(index, row) {
         this.$confirm(`确认删除[${row.informationName}]吗?`)
           .then(async () => {
             switch (this.activeName) {
@@ -669,7 +669,7 @@
       },
 
       //点击添加打开弹窗
-      clickAdd (val, name) {
+      clickAdd(val, name) {
         this.$refs.addDialogRef.equipmentdialog = true;
         if (val) {
           this.typeValue = val;
@@ -679,7 +679,7 @@
       },
 
       // 选择的设备
-      selectedEquipment (val) {
+      selectedEquipment(val) {
         switch (this.activeName) {
           case 'product': {
             this.productData = val;
@@ -706,7 +706,7 @@
         }
       },
 
-      async getTreeData (code) {
+      async getTreeData(code) {
         // try {
         //   const res = await common.getClassify({
         //     type: code,
@@ -730,7 +730,7 @@
         // } catch (error) {}
       },
 
-      convertTreeData (data) {
+      convertTreeData(data) {
         this.changeData = data;
         for (let i = 0; i < this.changeData.length; i++) {
           if (this.changeData[i].children != undefined) {
@@ -742,7 +742,7 @@
       },
 
       // 子节点处理
-      deepEach (parentId) {
+      deepEach(parentId) {
         this.changeData.map((item, index) => {
           if (item.id == parentId) {
             this.urlIdList.push(item.id);
@@ -751,7 +751,7 @@
         });
       },
 
-      setDefault (val) {
+      setDefault(val) {
         switch (val) {
           case 'w06': {
             this.activeName = 'product';
@@ -779,7 +779,7 @@
       },
 
       // 物品类型格式化
-      classificationCodeFormatter (row) {
+      classificationCodeFormatter(row) {
         let itemName = '';
         this.typeList.map((item) => {
           if (item.prefix == row.classificationCode) {
@@ -790,7 +790,7 @@
       },
 
       // 收缩系数格式化
-      shrinkFormatter (row) {
+      shrinkFormatter(row) {
         let shrink = '';
         let extendField = JSON.parse(row.extendField);
         if (extendField.hasOwnProperty('shrinkageCoefficient')) {
@@ -799,7 +799,7 @@
         return shrink;
       },
 
-      modleFormatter (row) {
+      modleFormatter(row) {
         let modle = '';
         let extendField = JSON.parse(row.extendField);
         if (extendField.hasOwnProperty('dieBodyModel')) {
@@ -808,7 +808,7 @@
         return modle;
       },
 
-      mapAddList () {
+      mapAddList() {
         this.mapList = [];
         if (this.defaultNum == 'w01') {
           this.mapList = this.partData.concat(this.mouldData);
@@ -823,7 +823,7 @@
         }
       },
 
-      matchList (key, data) {
+      matchList(key, data) {
         switch (key) {
           case 'w01': {
             this.facilityData = data[key];
@@ -850,7 +850,7 @@
         }
       },
 
-      initItemForm () {
+      initItemForm() {
         this.itemForm = {
           classificationUrlId: [],
           addList: [],
@@ -866,7 +866,7 @@
 </script>
 
 <style lang="scss" scoped>
-  ::v-deep.page-title {
+  :deep(.page-title) {
     border-bottom: 1px solid #eaeefb;
     padding-bottom: 8px;
     margin-bottom: 16px;
@@ -904,7 +904,7 @@
     }
   }
 
-  ::v-deep.attribute-row {
+  :deep(.attribute-row) {
     padding: 20px 5px;
     background: #fff;
     margin-top: 10px;

+ 17 - 17
src/views/classifyManage/itemInformation/components/AddDialog.vue

@@ -149,7 +149,7 @@
         default: ''
       }
     },
-    data () {
+    data() {
       return {
         treeLoading: false,
         equipmentdialog: false,
@@ -172,7 +172,7 @@
       };
     },
     watch: {
-      equipmentdialog (val) {
+      equipmentdialog(val) {
         if (val) {
           if (this.tableData.length) this.$refs.tableRef.clearSelection();
           this.$nextTick(() => {
@@ -186,12 +186,12 @@
           // if(this.tableData.length)  this.$refs.tableRef.clearSelection()
         }
       },
-      typeValue (val) {
+      typeValue(val) {
         if (val) {
           this.currentKey = null;
         }
       },
-      mapList (val) {
+      mapList(val) {
         if (val) {
           // if(this.tableData.length)  this.$refs.tableRef.clearSelection()
           // this.$nextTick(() => {
@@ -207,51 +207,51 @@
       }
     },
     methods: {
-      handleClose () {
+      handleClose() {
         this.equipmentdialog = false;
         this.tableSelectionList = [];
       },
 
-      handleCurrent (page) {
+      handleCurrent(page) {
         this.pagination.page = page;
         this.handleList();
       },
-      handleSize (size) {
+      handleSize(size) {
         this.pagination.page = 1;
         this.pagination.size = size;
         this.handleList();
       },
 
-      handleSelectionChange (val) {
+      handleSelectionChange(val) {
         this.tableSelectionList = val;
       },
       // handleCurSelectionChange (selection, row) {
 
       // },
 
-      toDelete (val) {
+      toDelete(val) {
         console.log('触发删除', val);
       },
 
-      getRowKeys (row) {
+      getRowKeys(row) {
         return row.id;
       },
 
       // 确定
-      selected () {
+      selected() {
         this.$emit('submit', this.tableSelectionList);
         this.handleClose();
       },
 
       // 树点击事件
-      handleNodeClick (data, node) {
+      handleNodeClick(data, node) {
         if (data.id === this.currentTreeData.id) return;
         this.currentTreeData = data;
         this.searchForm.classificationId = data.id;
         this.handleList();
       },
 
-      async handleList () {
+      async handleList() {
         const params = {
           ...this.searchForm,
           ...this.pagination
@@ -273,7 +273,7 @@
       },
 
       // 弹窗 - 按关键字搜索
-      searchByKeyWords () {
+      searchByKeyWords() {
         if (!this.currentTreeData) {
           this.$message.warning('请先选择设备!');
           return;
@@ -282,14 +282,14 @@
         this.handleList();
       },
       // 重置
-      reset () {
+      reset() {
         this.pagination.page = 1;
         this.searchForm.searchKey = '';
         this.handleList();
       },
 
       // 设置默认高亮行
-      setCurrentKey (id) {
+      setCurrentKey(id) {
         this.currentKey = id;
         this.$refs.tree.setCurrentKey(this.currentKey);
       }
@@ -307,7 +307,7 @@
   }
   .table_col {
     padding-left: 10px;
-    ::v-deep .el-table th.el-table__cell {
+    :deep(.el-table th.el-table__cell) {
       background: #f2f2f2;
     }
   }

+ 103 - 98
src/views/classifyManage/itemInformation/components/ItemDetail.vue

@@ -1,117 +1,122 @@
 <template>
-    <el-form label-width="90px" class="formBox">
-       <el-form-item label="分类">
-            <span>{{customForm.classificationUrl}}</span>
-       </el-form-item>
-       <el-form-item label="物品编码">
-            <span>{{customForm.informationCode}}</span>
-       </el-form-item>
-       <el-form-item label="物品名称">
-            <span>{{customForm.informationName}}</span>
-       </el-form-item>
-       <el-form-item label="计量单位">
-            <span>{{customForm.measuringUnit}}</span>
-       </el-form-item>
-       <el-form-item label="包装单位">
-            <span>{{customForm.packingUnit}}</span>
-       </el-form-item>
-       <el-form-item label="参考单价">
-            <span>{{customForm.univalence}} {{univalenceUnit}}/{{customForm.measuringUnit}}</span>
-        </el-form-item>
-        <el-form-item label="保质期">
-             <span>{{customForm.expirationDate}} {{expirationDateUnit}}</span>
-         </el-form-item>
-         <el-form-item label="安全库存">
-              <span>{{customForm.safeStock}}</span>
-         </el-form-item>
-         <el-form-item label="盘点模式" prop="itemMode">
-            <span>{{inventoryMode[customForm.takeStockPattern]}}</span>
-         </el-form-item>
-         <!-- <el-form-item label="允许转资产" prop="isTransferAssets">
+  <el-form label-width="90px" class="formBox">
+    <el-form-item label="分类">
+      <span>{{ customForm.classificationUrl }}</span>
+    </el-form-item>
+    <el-form-item label="物品编码">
+      <span>{{ customForm.informationCode }}</span>
+    </el-form-item>
+    <el-form-item label="物品名称">
+      <span>{{ customForm.informationName }}</span>
+    </el-form-item>
+    <el-form-item label="计量单位">
+      <span>{{ customForm.measuringUnit }}</span>
+    </el-form-item>
+    <el-form-item label="包装单位">
+      <span>{{ customForm.packingUnit }}</span>
+    </el-form-item>
+    <el-form-item label="参考单价">
+      <span
+        >{{ customForm.univalence }} {{ univalenceUnit }}/{{
+          customForm.measuringUnit
+        }}</span
+      >
+    </el-form-item>
+    <el-form-item label="保质期">
+      <span>{{ customForm.expirationDate }} {{ expirationDateUnit }}</span>
+    </el-form-item>
+    <el-form-item label="安全库存">
+      <span>{{ customForm.safeStock }}</span>
+    </el-form-item>
+    <el-form-item label="盘点模式" prop="itemMode">
+      <span>{{ inventoryMode[customForm.takeStockPattern] }}</span>
+    </el-form-item>
+    <!-- <el-form-item label="允许转资产" prop="isTransferAssets">
              <span>{{customForm.isTransferAssets?'允许':'不允许'}}</span>
          </el-form-item> -->
-         <el-form-item label="允许拆包" prop="isUnpack">
-             <span>{{customForm.isUnpack?'允许':'不允许'}}</span>
-         </el-form-item>
-         <el-form-item label="描述" prop="itemRemark">
-              <span>{{customForm.description}}</span>
-         </el-form-item>
-    </el-form>
+    <el-form-item label="允许拆包" prop="isUnpack">
+      <span>{{ customForm.isUnpack ? '允许' : '不允许' }}</span>
+    </el-form-item>
+    <el-form-item label="描述" prop="itemRemark">
+      <span>{{ customForm.description }}</span>
+    </el-form-item>
+  </el-form>
 </template>
 
 <script>
-
-export default {
-  props: {
-    customForm: {
-      type: Object,
-      default: {}
-    }
-  },
-  components: {  },
-  data () {
-    return {
-      inventoryMode:['逐个盘点','批量盘点','混合模式'],
-      priceList:[{id:0,value:'元',name:"yuan"},{id:1,value:'万元',name:"wanyuan"}],
-      dateList:[{id:0,value:'分钟',name:'minute'},{id:1,value:'小时',name:'hour'},{id:2,value:'天',name:'day'},{id:3,value:'月',name:'month'},{id:4,value:'年',name:'year'}],
-      univalenceUnit:'',
-      expirationDateUnit:''
-    }
-  },
-  watch:{
-     customForm(val){
-       if(val){
-         this.priceList.map(item=>{
-            if(item.name==val.univalenceUnit){
-               this.univalenceUnit = item.value
+  export default {
+    props: {
+      customForm: {
+        type: Object,
+        default: {}
+      }
+    },
+    components: {},
+    data() {
+      return {
+        inventoryMode: ['逐个盘点', '批量盘点', '混合模式'],
+        priceList: [
+          { id: 0, value: '元', name: 'yuan' },
+          { id: 1, value: '万元', name: 'wanyuan' }
+        ],
+        dateList: [
+          { id: 0, value: '分钟', name: 'minute' },
+          { id: 1, value: '小时', name: 'hour' },
+          { id: 2, value: '天', name: 'day' },
+          { id: 3, value: '月', name: 'month' },
+          { id: 4, value: '年', name: 'year' }
+        ],
+        univalenceUnit: '',
+        expirationDateUnit: ''
+      };
+    },
+    watch: {
+      customForm(val) {
+        if (val) {
+          this.priceList.map((item) => {
+            if (item.name == val.univalenceUnit) {
+              this.univalenceUnit = item.value;
             }
-         })
-         this.dateList.map(item=>{
-            if(item.name==val.expirationDateUnit){
-               this.expirationDateUnit = item.value
+          });
+          this.dateList.map((item) => {
+            if (item.name == val.expirationDateUnit) {
+              this.expirationDateUnit = item.value;
             }
-         })
-       }
-     }
-  },
-  created () {
-
-  },
-  methods: {
-
-
-
-
-  }
-}
+          });
+        }
+      }
+    },
+    created() {},
+    methods: {}
+  };
 </script>
 
-<style  lang="scss" scoped>
-  ::v-deep.formBox .el-form-item{
-    margin-bottom:17px;
-    .twobox{
-      width:100%;
-      display:flex;
-      align-items:center;
+<style lang="scss" scoped>
+  :deep(.formBox .el-form-item) {
+    margin-bottom: 17px;
+    .twobox {
+      width: 100%;
+      display: flex;
+      align-items: center;
       justify-content: space-between;
     }
-    .w60.el-input--medium{
-      width:60%;
-      margin-right:5px;
+    .w60.el-input--medium {
+      width: 60%;
+      margin-right: 5px;
     }
-    .el-input--small .el-input__inner{
-      height:36px;
-      line-height:36px;
+    .el-input--small .el-input__inner {
+      height: 36px;
+      line-height: 36px;
     }
-    .el-select.el-select--medium{
-      width:100%;
+    .el-select.el-select--medium {
+      width: 100%;
     }
-    .w40.el-select.el-select--medium{
-      width:40%
+    .w40.el-select.el-select--medium {
+      width: 40%;
     }
-    .el-radio{
-      display:block;
-      margin-top:10px;
+    .el-radio {
+      display: block;
+      margin-top: 10px;
     }
   }
 </style>

+ 272 - 243
src/views/classifyManage/itemInformation/components/ItemForm.vue

@@ -1,286 +1,315 @@
 <template>
-    <el-form :model="itemForm" :rules="rules" ref="formName" label-width="90px" class="formBox">
-       <el-form-item label="分类" prop="urlIdList" label-width="60px">
-            <!-- <el-tooltip class="item" effect="dark" content="Top Left 提示文字" placement="top-start"> -->
-                <el-cascader
-                    :key="keyValue"
-                    v-model="itemForm.urlIdList"
-                    :options="classList"
-                    :props="defaultProps"
-                    separator="-"
-                    filterable
-                    @change="chooseClassify"
-                    ref="cascader"
-                >
-                </el-cascader>
-            <!-- </el-tooltip> -->
-       </el-form-item>
-       <el-form-item label="物品编码" prop="itemCode">
-            <el-input placeholder="请输入" v-model="itemForm.itemCode" maxlength="9" :disabled="itemForm.isCitation">
-                <template slot="prepend">{{defaultNum}}</template>
-            </el-input>
-       </el-form-item>
-       <el-form-item label="物品名称" prop="informationName">
-            <el-input
-              placeholder="请输入"
-              v-model="itemForm.informationName"
-            ></el-input>
-       </el-form-item>
-       <el-form-item label="计量单位" prop="measuringUnit">
-            <el-input
-              placeholder="请输入"
-              v-model="itemForm.measuringUnit"
-            ></el-input>
-       </el-form-item>
-       <el-form-item label="包装单位" prop="packingUnit">
-            <el-input
-              placeholder="请输入"
-              v-model="itemForm.packingUnit"
-            ></el-input>
-       </el-form-item>
-        <!-- oninput="value=value.replace(/[^0-9.]/g,'')" -->
-       <el-form-item label="参考单价" prop="univalence">
-            <div class="twobox">
-             <el-input-number
-                placeholder="请输入"
-                v-model="itemForm.univalence"
-                :min="0"
-                style="width:80%;margin-right:10px"
-              ></el-input-number >
-              <el-select v-model="itemForm.univalenceUnit" placeholder="请选择" class="w40">
-                <el-option
-                  v-for="item in priceList"
-                  :key="item.id"
-                  :label="item.value"
-                  :value="item.name">
-                </el-option>
-              </el-select>
-            </div>
-        </el-form-item>
-        <el-form-item label="保质期" prop="expirationDate">
-             <div class="twobox">
-               <el-input-number
-                 placeholder="请输入"
-                 type="number"
-                 v-model="itemForm.expirationDate"
-                 :min="0"
-                 style="width:80%;margin-right:10px"
-               ></el-input-number >
-               <el-select v-model="itemForm.expirationDateUnit" placeholder="请选择" class="w40">
-                 <el-option
-                   v-for="item in dateList"
-                   :key="item.id"
-                   :label="item.value"
-                   :value="item.name">
-                 </el-option>
-               </el-select>
-             </div>
-         </el-form-item>
-         <el-form-item label="安全库存" prop="safeStock">
-              <el-input
-                placeholder="请输入"
-                v-model="itemForm.safeStock"
-              ></el-input>
-         </el-form-item>
-         <el-form-item label="盘点模式" prop="takeStockPattern">
-             <el-radio-group v-model="itemForm.takeStockPattern">
-               <el-radio :label="0">逐个盘点</el-radio>
-               <el-radio :label="1">批量盘点</el-radio>
-               <!-- <el-radio :label="2">混合模式</el-radio> -->
-             </el-radio-group>
-         </el-form-item>
-<!--         <el-form-item label="允许转资产" prop="isTransferAssets">
+  <el-form
+    :model="itemForm"
+    :rules="rules"
+    ref="formName"
+    label-width="90px"
+    class="formBox"
+  >
+    <el-form-item label="分类" prop="urlIdList" label-width="60px">
+      <!-- <el-tooltip class="item" effect="dark" content="Top Left 提示文字" placement="top-start"> -->
+      <el-cascader
+        :key="keyValue"
+        v-model="itemForm.urlIdList"
+        :options="classList"
+        :props="defaultProps"
+        separator="-"
+        filterable
+        @change="chooseClassify"
+        ref="cascader"
+      >
+      </el-cascader>
+      <!-- </el-tooltip> -->
+    </el-form-item>
+    <el-form-item label="物品编码" prop="itemCode">
+      <el-input
+        placeholder="请输入"
+        v-model="itemForm.itemCode"
+        maxlength="9"
+        :disabled="itemForm.isCitation"
+      >
+        <template slot="prepend">{{ defaultNum }}</template>
+      </el-input>
+    </el-form-item>
+    <el-form-item label="物品名称" prop="informationName">
+      <el-input
+        placeholder="请输入"
+        v-model="itemForm.informationName"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="计量单位" prop="measuringUnit">
+      <el-input
+        placeholder="请输入"
+        v-model="itemForm.measuringUnit"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="包装单位" prop="packingUnit">
+      <el-input placeholder="请输入" v-model="itemForm.packingUnit"></el-input>
+    </el-form-item>
+    <!-- oninput="value=value.replace(/[^0-9.]/g,'')" -->
+    <el-form-item label="参考单价" prop="univalence">
+      <div class="twobox">
+        <el-input-number
+          placeholder="请输入"
+          v-model="itemForm.univalence"
+          :min="0"
+          style="width: 80%; margin-right: 10px"
+        ></el-input-number>
+        <el-select
+          v-model="itemForm.univalenceUnit"
+          placeholder="请选择"
+          class="w40"
+        >
+          <el-option
+            v-for="item in priceList"
+            :key="item.id"
+            :label="item.value"
+            :value="item.name"
+          >
+          </el-option>
+        </el-select>
+      </div>
+    </el-form-item>
+    <el-form-item label="保质期" prop="expirationDate">
+      <div class="twobox">
+        <el-input-number
+          placeholder="请输入"
+          type="number"
+          v-model="itemForm.expirationDate"
+          :min="0"
+          style="width: 80%; margin-right: 10px"
+        ></el-input-number>
+        <el-select
+          v-model="itemForm.expirationDateUnit"
+          placeholder="请选择"
+          class="w40"
+        >
+          <el-option
+            v-for="item in dateList"
+            :key="item.id"
+            :label="item.value"
+            :value="item.name"
+          >
+          </el-option>
+        </el-select>
+      </div>
+    </el-form-item>
+    <el-form-item label="安全库存" prop="safeStock">
+      <el-input placeholder="请输入" v-model="itemForm.safeStock"></el-input>
+    </el-form-item>
+    <el-form-item label="盘点模式" prop="takeStockPattern">
+      <el-radio-group v-model="itemForm.takeStockPattern">
+        <el-radio :label="0">逐个盘点</el-radio>
+        <el-radio :label="1">批量盘点</el-radio>
+        <!-- <el-radio :label="2">混合模式</el-radio> -->
+      </el-radio-group>
+    </el-form-item>
+    <!--         <el-form-item label="允许转资产" prop="isTransferAssets">
              <el-switch v-model="itemForm.isTransferAssets"
                 active-value="true"
                 inactive-value="false"
              > </el-switch>
          </el-form-item> -->
-         <el-form-item label="允许拆包" prop="isUnpack">
-              <el-switch v-model="itemForm.isUnpack"
-                 active-value="true"
-                 inactive-value="false"
-                 :disabled="itemForm.isCitation"
-              > </el-switch>
-         </el-form-item>
-         <el-form-item label="描述" prop="description">
-              <el-input type="textarea" rows="3" resize="none"
-                placeholder="请输入"
-                v-model="itemForm.description"
-              ></el-input>
-         </el-form-item>
-    </el-form>
+    <el-form-item label="允许拆包" prop="isUnpack">
+      <el-switch
+        v-model="itemForm.isUnpack"
+        active-value="true"
+        inactive-value="false"
+        :disabled="itemForm.isCitation"
+      >
+      </el-switch>
+    </el-form-item>
+    <el-form-item label="描述" prop="description">
+      <el-input
+        type="textarea"
+        rows="3"
+        resize="none"
+        placeholder="请输入"
+        v-model="itemForm.description"
+      ></el-input>
+    </el-form-item>
+  </el-form>
 </template>
 
 <script>
-
-export default {
-  props: {
-    itemForm: {
-      type: Object,
-      default: {}
-    },
-    defaultNum:{
-      type:String,
-      default: 'w01'
+  export default {
+    props: {
+      itemForm: {
+        type: Object,
+        default: {}
+      },
+      defaultNum: {
+        type: String,
+        default: 'w01'
+      },
+      classList: {
+        type: Array,
+        default: []
+      }
     },
-    classList:{
-      type:Array,
-      default:[]
-    }
-
-  },
-  components: {  },
-  data () {
-    let validateCode = (rule, value, callback) => {
-        let reg = /[\u4e00-\u9fa5]/
+    components: {},
+    data() {
+      let validateCode = (rule, value, callback) => {
+        let reg = /[\u4e00-\u9fa5]/;
         // console.log('reg.test(value)',reg.test(value))
         if (reg.test(value)) {
-            callback(new Error("仅支持英文、数字及特殊字符"));
+          callback(new Error('仅支持英文、数字及特殊字符'));
         } else {
-            callback();
+          callback();
         }
-    }
-    return {
-      rules: {
-        urlIdList : [ {type: 'array',  required: true, message: '请选择分类', trigger: 'change' } ],
-        itemCode: [
-            { required: true, message: '请输入物品编码', trigger: 'blur'},
-            { validator: validateCode, trigger: "blur" }
+      };
+      return {
+        rules: {
+          urlIdList: [
+            {
+              type: 'array',
+              required: true,
+              message: '请选择分类',
+              trigger: 'change'
+            }
+          ],
+          itemCode: [
+            { required: true, message: '请输入物品编码', trigger: 'blur' },
+            { validator: validateCode, trigger: 'blur' }
+          ],
+          informationName: [
+            { required: true, message: '请输入物品名称', trigger: 'blur' }
+          ],
+          measuringUnit: [
+            { required: true, message: '请输入计量单位', trigger: 'blur' }
+          ],
+          packingUnit: [
+            { required: true, message: '请输入包装单位', trigger: 'blur' }
+          ],
+          takeStockPattern: [
+            { required: true, message: '请选择一个盘点模式', trigger: 'change' }
+          ]
+        },
+        priceList: [
+          { id: 0, value: '元', name: 'yuan' },
+          { id: 1, value: '万元', name: 'wanyuan' }
         ],
-        informationName: [ { required: true, message: '请输入物品名称', trigger: 'blur' }],
-        measuringUnit: [ { required: true, message: '请输入计量单位', trigger: 'blur' }],
-        packingUnit: [ { required: true, message: '请输入包装单位', trigger: 'blur' }],
-        takeStockPattern: [ { required: true, message: '请选择一个盘点模式', trigger: 'change' }]
-      },
-      priceList:[{id:0,value:'元',name:"yuan"},{id:1,value:'万元',name:"wanyuan"}],
-      dateList:[{id:0,value:'分钟',name:'minute'},{id:1,value:'小时',name:'hour'},{id:2,value:'天',name:'day'},{id:3,value:'月',name:'month'},{id:4,value:'年',name:'year'}],
-      typeList:[
-        {id:1,value:'w01  原料',prefix:'w01'},
-        {id:2,value:'w02  耗材',prefix:'w02'},
-        {id:3,value:'w03  设备',prefix:'w03'},
-        {id:4,value:'w04  产品',prefix:'w04'},
-        {id:5,value:'w05  舟皿',prefix:'w05'},
-        {id:6,value:'w06  周转车',prefix:'w06'},
-        {id:7,value:'w07  模具',prefix:'w07'},
-        {id:8,value:'w08  备品备件',prefix:'w08'}
-      ],
-      // itemForm:{
-      //   priceType:1, dateType:1
-      // },
-      defaultProps:{
-        children: 'children',
-        value: 'id',
-        label: 'name'
-      },
-      keyValue:0,
-
-
-
-    }
-  },
-  watch:{
-     defaultNum (val) {
-        if(val){
-
-        }
+        dateList: [
+          { id: 0, value: '分钟', name: 'minute' },
+          { id: 1, value: '小时', name: 'hour' },
+          { id: 2, value: '天', name: 'day' },
+          { id: 3, value: '月', name: 'month' },
+          { id: 4, value: '年', name: 'year' }
+        ],
+        typeList: [
+          { id: 1, value: 'w01  原料', prefix: 'w01' },
+          { id: 2, value: 'w02  耗材', prefix: 'w02' },
+          { id: 3, value: 'w03  设备', prefix: 'w03' },
+          { id: 4, value: 'w04  产品', prefix: 'w04' },
+          { id: 5, value: 'w05  舟皿', prefix: 'w05' },
+          { id: 6, value: 'w06  周转车', prefix: 'w06' },
+          { id: 7, value: 'w07  模具', prefix: 'w07' },
+          { id: 8, value: 'w08  备品备件', prefix: 'w08' }
+        ],
+        // itemForm:{
+        //   priceType:1, dateType:1
+        // },
+        defaultProps: {
+          children: 'children',
+          value: 'id',
+          label: 'name'
+        },
+        keyValue: 0
+      };
     },
+    watch: {
+      defaultNum(val) {
+        if (val) {
+        }
+      },
 
-    itemForm(val){
+      itemForm(val) {},
 
+      classList(val) {
+        this.keyValue++;
+      }
     },
-
-    classList(val){
-      this.keyValue++
-    }
-
-  },
-  created () {
-
-
-  },
-  methods: {
+    created() {},
+    methods: {
       // // 在 Input 值改变时触发
       handleEdit(e) {
-
-          // let value = e.replace(/^(0+)|[^\d]+/g,''); // 以0开头或者输入非数字,会被替换成空
-          // value = value.replace(/(\d{15})\d*/, '$1') // 最多保留15位整数
-          // this.itemForm.expirationDate = value
+        // let value = e.replace(/^(0+)|[^\d]+/g,''); // 以0开头或者输入非数字,会被替换成空
+        // value = value.replace(/(\d{15})\d*/, '$1') // 最多保留15位整数
+        // this.itemForm.expirationDate = value
       },
 
       //子组件接收callback为父组件传过来的next()方法
       validateForm(callback) {
-          // let flag = true;
-          //开始表单校验
-          this.$refs.formName.validate((valid) => {
-            callback(valid)
-            // if (valid) {
-            //   this.itemForm.informationCode = this.defaultNum + this.itemForm.informationCode
-            //   console.log('itemForm',this.itemForm)
-            //   flag = true
-            // } else {
-            //   console.log('error submit!!');
-            //   return false;
-            // }
-          });
-          // 如果flag为true,则执行callback()
-          // if (flag) {
-              // callback();
+        // let flag = true;
+        //开始表单校验
+        this.$refs.formName.validate((valid) => {
+          callback(valid);
+          // if (valid) {
+          //   this.itemForm.informationCode = this.defaultNum + this.itemForm.informationCode
+          //   console.log('itemForm',this.itemForm)
+          //   flag = true
+          // } else {
+          //   console.log('error submit!!');
+          //   return false;
           // }
+        });
+        // 如果flag为true,则执行callback()
+        // if (flag) {
+        // callback();
+        // }
       },
 
       // 选择分类
-      chooseClassify(val){
-
-      },
+      chooseClassify(val) {},
 
-      getText(){
-          // 获取节点下的汉字
-         let pathName =  this.$refs.cascader.getCheckedNodes()[0].pathLabels.toString()
-         let pathId = this.$refs.cascader.getCheckedNodes()[0].path
-         pathId = pathId[pathId.length-1]
-          //用for循环遍历获取的数据,并把逗号替换
-            for(let i = 0;i<pathName.length;i++){
-              if(pathName[i] === ','){
-                pathName = pathName.replace(pathName[i],'-')
-              }
-            }
-            return {pathName,pathId}
+      getText() {
+        // 获取节点下的汉字
+        let pathName = this.$refs.cascader
+          .getCheckedNodes()[0]
+          .pathLabels.toString();
+        let pathId = this.$refs.cascader.getCheckedNodes()[0].path;
+        pathId = pathId[pathId.length - 1];
+        //用for循环遍历获取的数据,并把逗号替换
+        for (let i = 0; i < pathName.length; i++) {
+          if (pathName[i] === ',') {
+            pathName = pathName.replace(pathName[i], '-');
+          }
+        }
+        return { pathName, pathId };
       }
-
-
-  }
-}
+    }
+  };
 </script>
 
-<style  lang="scss" scoped>
-  ::v-deep.formBox .el-form-item{
-    margin-bottom:17px;
-    .twobox{
-      width:100%;
-      display:flex;
-      align-items:center;
+<style lang="scss" scoped>
+  :deep(.formBox .el-form-item) {
+    margin-bottom: 17px;
+    .twobox {
+      width: 100%;
+      display: flex;
+      align-items: center;
       justify-content: space-between;
     }
-    .el-form-item__content .el-cascader{
-      width:100%
+    .el-form-item__content .el-cascader {
+      width: 100%;
     }
-    .w60.el-input--medium{
-      width:60%;
-      margin-right:5px;
+    .w60.el-input--medium {
+      width: 60%;
+      margin-right: 5px;
     }
-    .el-input--small .el-input__inner{
-      height:36px;
-      line-height:36px;
+    .el-input--small .el-input__inner {
+      height: 36px;
+      line-height: 36px;
     }
-    .el-select.el-select--medium{
-      width:100%;
+    .el-select.el-select--medium {
+      width: 100%;
     }
-    .w40.el-select.el-select--medium{
-      width:40%
+    .w40.el-select.el-select--medium {
+      width: 40%;
     }
-    .el-radio{
-      display:block;
-      margin-top:10px;
+    .el-radio {
+      display: block;
+      margin-top: 10px;
     }
   }
 </style>

+ 185 - 168
src/views/classifyManage/itemInformation/components/RowDetail.vue

@@ -1,184 +1,201 @@
 <template>
-   <el-form :model="customForm" ref="formCustom" class="row-form">
-       <el-row>
-           <el-col :span="8" v-if="defaultNum=='w06'||defaultNum=='w07'||defaultNum=='w04'">
-                <el-form-item label="牌号" prop="brandNumber" label-width="60px">
-                     <span>{{customForm.brandNum}}</span>
-                </el-form-item>
-           </el-col>
-             <el-col :span="8" v-if="defaultNum=='w08'||defaultNum=='w01'||defaultNum=='w02'||defaultNum=='w03'||defaultNum=='w05'">
-                  <el-form-item label="规格" prop="gg" label-width="60px">
-                      <span>{{customForm.specification}}</span>
-                  </el-form-item>
-             </el-col>
-             <el-col :span="8" v-if="defaultNum!='w06'">
-                  <el-form-item label="型号" prop="xh" label-width="60px">
-                      <span>{{customForm.modelType}}</span>
-                  </el-form-item>
-             </el-col>
-             <el-col :span="8" v-if="defaultNum=='w03'">
-                  <el-form-item label="材质" prop="xh" label-width="60px">
-                      <span>{{extendField.texture}}</span>
-                  </el-form-item>
-             </el-col>
-            <el-col :span="8" v-if="defaultNum=='w01'">
-                 <el-form-item label="标准产能" prop="bzcn" label-width="85px">
-                      <span>{{extendField.standardCapacity?extendField.standardCapacity:'-'}}/小时</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w07'">
-                 <el-form-item label="标准单重" prop="bzcn" label-width="85px">
-                      <span>{{extendField.pieceWeight?extendField.pieceWeight:'-'}}KG</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w07'">
-                 <el-form-item label="不良品率" prop="bzcn" label-width="85px">
-                      <span>{{extendField.unqualifiedRate?extendField.unqualifiedRate:'-'}}%</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w02'">
-                 <el-form-item label="角度" prop="bzcn" label-width="60px">
-                       <span>{{extendField.angle}}</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w02'||defaultNum=='w03'">
-                 <el-form-item label="长" prop="bzcn" label-width="60px">
-                     <span>{{extendField.length?extendField.length:'-'}}mm</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w02'||defaultNum=='w03'">
-                 <el-form-item label="宽" prop="bzcn" label-width="60px">
-                     <span>{{extendField.width?extendField.width:'-'}}mm</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w02'||defaultNum=='w03'">
-                 <el-form-item label="高" prop="bzcn" label-width="60px">
-                    <span>{{extendField.high?extendField.high:'-'}}mm</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="大模体型号" prop="bzcn" label-width="95px">
-                      <span>{{extendField.dieBodyModel}}</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="收缩系数" prop="bzcn" label-width="85px">
-                     <span>{{extendField.shrinkageCoefficient}}</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="芯杆数量" prop="bzcn" label-width="85px">
-                      <span>{{extendField.mandrelNum}}</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="模孔数量" prop="bzcn" label-width="85px">
-                     <span>{{extendField.dieHoleNum}}</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="上冲头数量" prop="bzcn" label-width="95px">
-                     <span>{{extendField.upperPunchNum}}</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="下冲头数量" prop="bzcn" label-width="95px">
-                      <span>{{extendField.lowerPunchNum}}</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="最大冲压次数" prop="bzcn" label-width="105px">
-                     <span>{{extendField.maximumStampingTimes}}</span>
-                 </el-form-item>
-            </el-col>
-           <el-col :span="8" v-for="(item,index) in selfDefinedParameter" :key="index">
-                <el-form-item>
-                  <div  class="add-col">
-                      <span class="col-input">{{item.key}}</span>
-                      <span class="col-input">{{item.value}}</span>
-                  </div>
-                </el-form-item>
-           </el-col>
-
-
-       </el-row>
-   </el-form>
+  <el-form :model="customForm" ref="formCustom" class="row-form">
+    <el-row>
+      <el-col
+        :span="8"
+        v-if="defaultNum == 'w06' || defaultNum == 'w07' || defaultNum == 'w04'"
+      >
+        <el-form-item label="牌号" prop="brandNumber" label-width="60px">
+          <span>{{ customForm.brandNum }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col
+        :span="8"
+        v-if="
+          defaultNum == 'w08' ||
+          defaultNum == 'w01' ||
+          defaultNum == 'w02' ||
+          defaultNum == 'w03' ||
+          defaultNum == 'w05'
+        "
+      >
+        <el-form-item label="规格" prop="gg" label-width="60px">
+          <span>{{ customForm.specification }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum != 'w06'">
+        <el-form-item label="型号" prop="xh" label-width="60px">
+          <span>{{ customForm.modelType }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w03'">
+        <el-form-item label="材质" prop="xh" label-width="60px">
+          <span>{{ extendField.texture }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w01'">
+        <el-form-item label="标准产能" prop="bzcn" label-width="85px">
+          <span
+            >{{
+              extendField.standardCapacity ? extendField.standardCapacity : '-'
+            }}/小时</span
+          >
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w07'">
+        <el-form-item label="标准单重" prop="bzcn" label-width="85px">
+          <span
+            >{{
+              extendField.pieceWeight ? extendField.pieceWeight : '-'
+            }}KG</span
+          >
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w07'">
+        <el-form-item label="不良品率" prop="bzcn" label-width="85px">
+          <span
+            >{{
+              extendField.unqualifiedRate ? extendField.unqualifiedRate : '-'
+            }}%</span
+          >
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w02'">
+        <el-form-item label="角度" prop="bzcn" label-width="60px">
+          <span>{{ extendField.angle }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w02' || defaultNum == 'w03'">
+        <el-form-item label="长" prop="bzcn" label-width="60px">
+          <span>{{ extendField.length ? extendField.length : '-' }}mm</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w02' || defaultNum == 'w03'">
+        <el-form-item label="宽" prop="bzcn" label-width="60px">
+          <span>{{ extendField.width ? extendField.width : '-' }}mm</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w02' || defaultNum == 'w03'">
+        <el-form-item label="高" prop="bzcn" label-width="60px">
+          <span>{{ extendField.high ? extendField.high : '-' }}mm</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="大模体型号" prop="bzcn" label-width="95px">
+          <span>{{ extendField.dieBodyModel }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="收缩系数" prop="bzcn" label-width="85px">
+          <span>{{ extendField.shrinkageCoefficient }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="芯杆数量" prop="bzcn" label-width="85px">
+          <span>{{ extendField.mandrelNum }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="模孔数量" prop="bzcn" label-width="85px">
+          <span>{{ extendField.dieHoleNum }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="上冲头数量" prop="bzcn" label-width="95px">
+          <span>{{ extendField.upperPunchNum }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="下冲头数量" prop="bzcn" label-width="95px">
+          <span>{{ extendField.lowerPunchNum }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="最大冲压次数" prop="bzcn" label-width="105px">
+          <span>{{ extendField.maximumStampingTimes }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col
+        :span="8"
+        v-for="(item, index) in selfDefinedParameter"
+        :key="index"
+      >
+        <el-form-item>
+          <div class="add-col">
+            <span class="col-input">{{ item.key }}</span>
+            <span class="col-input">{{ item.value }}</span>
+          </div>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
 </template>
 
 <script>
-
-export default {
-  props: {
-    customForm: {
-      type: Object,
-      default: {}
+  export default {
+    props: {
+      customForm: {
+        type: Object,
+        default: {}
+      },
+      defaultNum: {
+        type: String,
+        default: 'w01'
+      }
     },
-    defaultNum:{
-      type:String,
-      default:'w01'
-    }
-  },
-  components: {  },
-  data () {
-    return {
-         angleList:[
-            {id:0,value:'非A'},
-            {id:1,value:'A'}
-         ],
-         extendField:{},
-         selfDefinedParameter:[]
-
-
-    }
-  },
-  watch:{
-     customForm(val){
-       if(val){
-          this.extendField = JSON.parse(val.extendField)
-          this.selfDefinedParameter = JSON.parse(val.selfDefinedParameter)
-       }
-     }
-  },
-  created () {
-
-  },
-  methods: {
-
-
-
-  }
-}
+    components: {},
+    data() {
+      return {
+        angleList: [
+          { id: 0, value: '非A' },
+          { id: 1, value: 'A' }
+        ],
+        extendField: {},
+        selfDefinedParameter: []
+      };
+    },
+    watch: {
+      customForm(val) {
+        if (val) {
+          this.extendField = JSON.parse(val.extendField);
+          this.selfDefinedParameter = JSON.parse(val.selfDefinedParameter);
+        }
+      }
+    },
+    created() {},
+    methods: {}
+  };
 </script>
 
-<style  lang="scss" scoped>
-  ::v-deep.row-form{
-    width:100%;
-    display:flex;
-    align-items:center;
+<style lang="scss" scoped>
+  :deep(.row-form) {
+    width: 100%;
+    display: flex;
+    align-items: center;
     justify-content: flex-start;
-    flex-wrap:wrap;
-    border-bottom:1px dashed #ccc;
-    .el-row{
-      width:100%;
+    flex-wrap: wrap;
+    border-bottom: 1px dashed #ccc;
+    .el-row {
+      width: 100%;
     }
-    .el-form-item{
-      margin-bottom:15px;
+    .el-form-item {
+      margin-bottom: 15px;
     }
-    .row-col{
-      display:flex;
-      align-items:center;
-      justify-content:flex-start;
-      .el-input--medium{
-        width:80%;
-        margin-right:10px;
+    .row-col {
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+      .el-input--medium {
+        width: 80%;
+        margin-right: 10px;
       }
     }
-    .add-col{
-      display:flex;
-      align-items:center;
+    .add-col {
+      display: flex;
+      align-items: center;
       margin-left: 20px;
-      .col-input{
-        margin-right:5px;
+      .col-input {
+        margin-right: 5px;
       }
     }
   }

+ 325 - 289
src/views/classifyManage/itemInformation/components/RowForm.vue

@@ -1,320 +1,356 @@
 <template>
-   <el-form :model="itemForm" :rules="customRule" ref="formCustom" class="row-form">
-       <el-row>
-           <el-col :span="8" v-if="defaultNum=='w06'||defaultNum=='w07'||defaultNum=='w04'">
-                <el-form-item label="牌号" label-width="60px" :prop="defaultNum=='w06'?'brandNum':''">
-                      <el-input
-                        v-model="itemForm.brandNum"
-                        placeholder="请输入"></el-input>
-                </el-form-item>
-           </el-col>
-             <el-col :span="8" v-if="defaultNum=='w08'||defaultNum=='w01'||defaultNum=='w02'||defaultNum=='w03'||defaultNum=='w05'">
-                  <el-form-item label="规格" prop="specification" label-width="60px">
-                        <el-input
-                          v-model="itemForm.specification"
-                          placeholder="请输入"></el-input>
-                  </el-form-item>
-             </el-col>
-             <el-col :span="8" v-if="defaultNum!='w06'">
-                  <el-form-item label="型号" prop="modelType" label-width="60px">
-                        <el-input
-                          v-model="itemForm.modelType"
-                          placeholder="请输入"></el-input>
-                  </el-form-item>
-             </el-col>
-             <el-col :span="8" v-if="defaultNum=='w03'">
-                  <el-form-item label="材质" prop="texture" label-width="60px">
-                        <el-input
-                           :disabled="itemForm.isCitation"
-                          v-model="itemForm.info.texture"
-                          placeholder="请输入"></el-input>
-                  </el-form-item>
-             </el-col>
-            <el-col :span="8" v-if="defaultNum=='w01'">
-                 <el-form-item label="标准产能" label-width="85px">
-                       <div class="row-col">
-                          <el-input
-                            type="number"
-                            v-model="itemForm.info.standardCapacity"
-                            placeholder="请输入"></el-input>
-                          <span>/小时</span>
-                       </div>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w07'">
-                 <el-form-item label="标准单重" label-width="85px">
-                      <el-input-number
-                        style="width:80%"
-                        type="number"
-                        v-model="itemForm.info.pieceWeight"
-                        :min="0"
-                        placeholder="请输入"></el-input-number>
-                      <span class="spanbox">KG</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w07'">
-                 <el-form-item label="不良品率" label-width="85px">
-                      <el-input-number
-                        style="width:85%"
-                        type="number"
-                        v-model="itemForm.info.unqualifiedRate"
-                        :min="0"
-                        :max="100"
-                        placeholder="请输入"></el-input-number>
-                      <span class="spanbox">%</span>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w02'">
-                 <el-form-item label="角度" label-width="60px">
-                       <el-select v-model="itemForm.info.angle" placeholder="请选择">
-                         <el-option
-                           v-for="item in angleList"
-                           :key="item.id"
-                           :label="item.value"
-                           :value="item.name">
-                         </el-option>
-                       </el-select>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w02'||defaultNum=='w03'">
-                 <el-form-item label="长" label-width="60px">
-                       <div>
-                            <el-input-number
-                              style="width:80%;margin-right:10px"
-                              type="number"
-                              v-model="itemForm.info.length"
-                              :min="0"
-                              placeholder="请输入"></el-input-number>
-                          <span>mm</span>
-                       </div>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w02'||defaultNum=='w03'">
-                 <el-form-item label="宽" label-width="60px">
-                       <div>
-                            <el-input-number
-                              style="width:80%;margin-right:10px"
-                              type="number"
-                              v-model="itemForm.info.width"
-                              :min="0"
-                              placeholder="请输入"></el-input-number>
-                          <span>mm</span>
-                       </div>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w02'||defaultNum=='w03'">
-                 <el-form-item label="高" label-width="60px">
-                       <div>
-                            <el-input-number
-                              style="width:80%;margin-right:10px"
-                              type="number"
-                              v-model="itemForm.info.high"
-                              :min="0"
-                              placeholder="请输入"></el-input-number>
-                          <span>mm</span>
-                       </div>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="大模体型号" label-width="95px">
-                      <el-input
-                        v-model="itemForm.info.dieBodyModel"
-                        placeholder="请输入"></el-input>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="收缩系数" label-width="85px">
-                      <el-input
-                        v-model="itemForm.info.shrinkageCoefficient"
-                        placeholder="请输入"></el-input>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="芯杆数量" label-width="85px">
-                      <el-input
-                        v-model="itemForm.info.mandrelNum"
-                        oninput="value=value.replace(/[^0-9.]/g,'')"
-                        type="number"
-                        placeholder="请输入"></el-input>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="模孔数量" label-width="85px">
-                      <el-input
-                        v-model="itemForm.info.dieHoleNum"
-                        type="number"
-                        oninput="value=value.replace(/[^0-9.]/g,'')"
-                        placeholder="请输入"></el-input>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="上冲头数量" label-width="95px">
-                      <el-input
-                        v-model="itemForm.info.upperPunchNum"
-                        type="number"
-                        oninput="value=value.replace(/[^0-9.]/g,'')"
-                        placeholder="请输入"></el-input>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="下冲头数量" label-width="95px">
-                      <el-input
-                        v-model="itemForm.info.lowerPunchNum"
-                        type="number"
-                        oninput="value=value.replace(/[^0-9.]/g,'')"
-                        placeholder="请输入"></el-input>
-                 </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="defaultNum=='w04'">
-                 <el-form-item label="最大冲压次数" label-width="105px">
-                      <el-input
-                        v-model="itemForm.info.maximumStampingTimes"
-                        type="number"
-                        oninput="value=value.replace(/[^0-9.]/g,'')"
-                        placeholder="请输入"></el-input>
-                 </el-form-item>
-            </el-col>
-           <el-col :span="8" v-for="(item,index) in itemForm.addList" :key="index">
-                <el-form-item
-                   :prop="'addList.' + index + '.key'"
-                   :rules="{
-                      required: true, message: '自定义参数名称不能为空', trigger: 'blur'
-                  }"
-                >
-                  <div  class="add-col">
-                      <el-input class="col-input" v-model="item.key" placeholder="参数名称"></el-input>
-                      <el-input class="col-input" v-model="item.value" placeholder="参数值"></el-input>
-                      <el-button type="text" @click="delt(item,index)"> 删除 </el-button>
-                  </div>
-                </el-form-item>
-           </el-col>
-           <el-col :span="8" v-if="itemForm.addList.length<10">
-               <el-form-item label-width="20px">
-                    <el-button type="primary" @click="addItem">增加自定义参数</el-button>
-               </el-form-item>
-           </el-col>
-
-
-       </el-row>
-   </el-form>
+  <el-form
+    :model="itemForm"
+    :rules="customRule"
+    ref="formCustom"
+    class="row-form"
+  >
+    <el-row>
+      <el-col
+        :span="8"
+        v-if="defaultNum == 'w06' || defaultNum == 'w07' || defaultNum == 'w04'"
+      >
+        <el-form-item
+          label="牌号"
+          label-width="60px"
+          :prop="defaultNum == 'w06' ? 'brandNum' : ''"
+        >
+          <el-input v-model="itemForm.brandNum" placeholder="请输入"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col
+        :span="8"
+        v-if="
+          defaultNum == 'w08' ||
+          defaultNum == 'w01' ||
+          defaultNum == 'w02' ||
+          defaultNum == 'w03' ||
+          defaultNum == 'w05'
+        "
+      >
+        <el-form-item label="规格" prop="specification" label-width="60px">
+          <el-input
+            v-model="itemForm.specification"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum != 'w06'">
+        <el-form-item label="型号" prop="modelType" label-width="60px">
+          <el-input
+            v-model="itemForm.modelType"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w03'">
+        <el-form-item label="材质" prop="texture" label-width="60px">
+          <el-input
+            :disabled="itemForm.isCitation"
+            v-model="itemForm.info.texture"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w01'">
+        <el-form-item label="标准产能" label-width="85px">
+          <div class="row-col">
+            <el-input
+              type="number"
+              v-model="itemForm.info.standardCapacity"
+              placeholder="请输入"
+            ></el-input>
+            <span>/小时</span>
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w07'">
+        <el-form-item label="标准单重" label-width="85px">
+          <el-input-number
+            style="width: 80%"
+            type="number"
+            v-model="itemForm.info.pieceWeight"
+            :min="0"
+            placeholder="请输入"
+          ></el-input-number>
+          <span class="spanbox">KG</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w07'">
+        <el-form-item label="不良品率" label-width="85px">
+          <el-input-number
+            style="width: 85%"
+            type="number"
+            v-model="itemForm.info.unqualifiedRate"
+            :min="0"
+            :max="100"
+            placeholder="请输入"
+          ></el-input-number>
+          <span class="spanbox">%</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w02'">
+        <el-form-item label="角度" label-width="60px">
+          <el-select v-model="itemForm.info.angle" placeholder="请选择">
+            <el-option
+              v-for="item in angleList"
+              :key="item.id"
+              :label="item.value"
+              :value="item.name"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w02' || defaultNum == 'w03'">
+        <el-form-item label="长" label-width="60px">
+          <div>
+            <el-input-number
+              style="width: 80%; margin-right: 10px"
+              type="number"
+              v-model="itemForm.info.length"
+              :min="0"
+              placeholder="请输入"
+            ></el-input-number>
+            <span>mm</span>
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w02' || defaultNum == 'w03'">
+        <el-form-item label="宽" label-width="60px">
+          <div>
+            <el-input-number
+              style="width: 80%; margin-right: 10px"
+              type="number"
+              v-model="itemForm.info.width"
+              :min="0"
+              placeholder="请输入"
+            ></el-input-number>
+            <span>mm</span>
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w02' || defaultNum == 'w03'">
+        <el-form-item label="高" label-width="60px">
+          <div>
+            <el-input-number
+              style="width: 80%; margin-right: 10px"
+              type="number"
+              v-model="itemForm.info.high"
+              :min="0"
+              placeholder="请输入"
+            ></el-input-number>
+            <span>mm</span>
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="大模体型号" label-width="95px">
+          <el-input
+            v-model="itemForm.info.dieBodyModel"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="收缩系数" label-width="85px">
+          <el-input
+            v-model="itemForm.info.shrinkageCoefficient"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="芯杆数量" label-width="85px">
+          <el-input
+            v-model="itemForm.info.mandrelNum"
+            oninput="value=value.replace(/[^0-9.]/g,'')"
+            type="number"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="模孔数量" label-width="85px">
+          <el-input
+            v-model="itemForm.info.dieHoleNum"
+            type="number"
+            oninput="value=value.replace(/[^0-9.]/g,'')"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="上冲头数量" label-width="95px">
+          <el-input
+            v-model="itemForm.info.upperPunchNum"
+            type="number"
+            oninput="value=value.replace(/[^0-9.]/g,'')"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="下冲头数量" label-width="95px">
+          <el-input
+            v-model="itemForm.info.lowerPunchNum"
+            type="number"
+            oninput="value=value.replace(/[^0-9.]/g,'')"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="defaultNum == 'w04'">
+        <el-form-item label="最大冲压次数" label-width="105px">
+          <el-input
+            v-model="itemForm.info.maximumStampingTimes"
+            type="number"
+            oninput="value=value.replace(/[^0-9.]/g,'')"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-for="(item, index) in itemForm.addList" :key="index">
+        <el-form-item
+          :prop="'addList.' + index + '.key'"
+          :rules="{
+            required: true,
+            message: '自定义参数名称不能为空',
+            trigger: 'blur'
+          }"
+        >
+          <div class="add-col">
+            <el-input
+              class="col-input"
+              v-model="item.key"
+              placeholder="参数名称"
+            ></el-input>
+            <el-input
+              class="col-input"
+              v-model="item.value"
+              placeholder="参数值"
+            ></el-input>
+            <el-button type="text" @click="delt(item, index)"> 删除 </el-button>
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8" v-if="itemForm.addList.length < 10">
+        <el-form-item label-width="20px">
+          <el-button type="primary" @click="addItem">增加自定义参数</el-button>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
 </template>
 
 <script>
-
-export default {
-  props: {
-    itemForm: {
-      type: Object,
-      default: {}
+  export default {
+    props: {
+      itemForm: {
+        type: Object,
+        default: {}
+      },
+      defaultNum: {
+        type: String,
+        default: 'w01'
+      }
     },
-    defaultNum:{
-      type:String,
-      default:'w01'
-    }
-  },
-  components: {  },
-  data () {
-    return {
-         // customForm:{
-         //   addList:[]
-         // },
-         customRule:{
-           brandNum: [ { required: true, message: '请输入牌号', trigger: 'blur' } ],
-         },
-         angleList:[
-            {id:0,value:'非A',name:'notA'},
-            {id:1,value:'A',name:'A'}
-         ]
-
-
-    }
-  },
-  watch:{
-    itemForm(val){
-       if(val){
-
-       }
+    components: {},
+    data() {
+      return {
+        // customForm:{
+        //   addList:[]
+        // },
+        customRule: {
+          brandNum: [{ required: true, message: '请输入牌号', trigger: 'blur' }]
+        },
+        angleList: [
+          { id: 0, value: '非A', name: 'notA' },
+          { id: 1, value: 'A', name: 'A' }
+        ]
+      };
     },
-  },
-  created () {
-
-  },
-  methods: {
+    watch: {
+      itemForm(val) {
+        if (val) {
+        }
+      }
+    },
+    created() {},
+    methods: {
       // 在 Input 值改变时触发
       handleEdit(e) {
-          let value = e.replace(/^(0+)|[^\d]+/g,''); // 以0开头或者输入非数字,会被替换成空
+        let value = e.replace(/^(0+)|[^\d]+/g, ''); // 以0开头或者输入非数字,会被替换成空
       },
       // 添加自定义参数
-      addItem(){
-        if(this.itemForm.addList.length<10){
-          let item = {key:'',value:''}
-           this.itemForm.addList.push(item)
-        }else{
-          this.$message.warning('自定义参数最多添加10条')
+      addItem() {
+        if (this.itemForm.addList.length < 10) {
+          let item = { key: '', value: '' };
+          this.itemForm.addList.push(item);
+        } else {
+          this.$message.warning('自定义参数最多添加10条');
         }
       },
 
       // 删除自定义参数
-      delt(item,index){
-          this.itemForm.addList.splice(index,1)
+      delt(item, index) {
+        this.itemForm.addList.splice(index, 1);
       },
 
       //子组件接收callback为父组件传过来的next()方法
       validateForm(callback) {
-          // let flag = true;
-          //开始表单校验
-          this.$refs.formCustom.validate((valid) => {
-            callback(valid);
-            // if (valid) {
-            //   flag = true
-            // } else {
-            //   return false;
-            // }
-          });
-          // 如果flag为true,则执行callback()
-          // if (flag) {
-              // callback();
+        // let flag = true;
+        //开始表单校验
+        this.$refs.formCustom.validate((valid) => {
+          callback(valid);
+          // if (valid) {
+          //   flag = true
+          // } else {
+          //   return false;
           // }
-      },
-
-
-  }
-}
+        });
+        // 如果flag为true,则执行callback()
+        // if (flag) {
+        // callback();
+        // }
+      }
+    }
+  };
 </script>
 
-<style  lang="scss" scoped>
-  ::v-deep.row-form{
-    width:100%;
-    display:flex;
-    align-items:center;
+<style lang="scss" scoped>
+  :deep(.row-form) {
+    width: 100%;
+    display: flex;
+    align-items: center;
     justify-content: flex-start;
-    flex-wrap:wrap;
-    border-bottom:1px dashed #ccc;
-    .el-row{
-      width:100%;
+    flex-wrap: wrap;
+    border-bottom: 1px dashed #ccc;
+    .el-row {
+      width: 100%;
     }
-    .el-form-item{
-      margin-bottom:15px;
+    .el-form-item {
+      margin-bottom: 15px;
     }
-    .row-col{
-      display:flex;
-      align-items:center;
-      justify-content:flex-start;
-      .el-input--medium{
-        width:75%;
-        margin-right:10px;
+    .row-col {
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+      .el-input--medium {
+        width: 75%;
+        margin-right: 10px;
       }
     }
-    .spanbox{
-      display:inline-block;
-      margin-left:10px;
+    .spanbox {
+      display: inline-block;
+      margin-left: 10px;
     }
-    .add-col{
-      display:flex;
-      align-items:center;
+    .add-col {
+      display: flex;
+      align-items: center;
       margin-left: 20px;
-      .col-input{
-        margin-right:5px;
+      .col-input {
+        margin-right: 5px;
       }
     }
   }

+ 14 - 14
src/views/classifyManage/itemInformation/details.vue

@@ -205,7 +205,7 @@
   import { getDetails } from '@/api/classifyManage/itemInformation';
   export default {
     components: { ItemDetail, RowDetail },
-    data () {
+    data() {
       return {
         pageTitle: '',
         typeList: [
@@ -239,11 +239,11 @@
         itemValue: ''
       };
     },
-    created () {
+    created() {
       this.getDetilInfo(this.$route.query.id);
     },
     methods: {
-      async getDetilInfo (id) {
+      async getDetilInfo(id) {
         const res = await getDetails({ id: id });
         if (res.success) {
           this.customForm = res.data;
@@ -256,7 +256,7 @@
         }
       },
 
-      formatterValue (code) {
+      formatterValue(code) {
         this.typeList.map((item) => {
           if (item.prefix == code) {
             this.itemValue = item.value;
@@ -264,11 +264,11 @@
         });
       },
 
-      goBack () {
+      goBack() {
         this.$router.go(-1);
       },
       // 显示默认选中的tab
-      setDefault (val) {
+      setDefault(val) {
         switch (val) {
           case 'w06': {
             this.activeName = 'product';
@@ -295,7 +295,7 @@
         }
       },
 
-      matchList (key, data) {
+      matchList(key, data) {
         switch (key) {
           case 'w01': {
             this.facilityData = data[key];
@@ -322,25 +322,25 @@
         }
       },
 
-      handleDelete (index, row) {},
+      handleDelete(index, row) {},
 
       //点击添加打开弹窗
-      clickAdd () {
+      clickAdd() {
         this.$refs.addDialogRef.equipmentdialog = true;
       },
 
-      handleCurrent (page) {
+      handleCurrent(page) {
         this.pagination.page = page;
         // this._getList(this.params)
       },
-      handleSize (size) {
+      handleSize(size) {
         this.pagination.page = 1;
         this.pagination.size = size;
         // this._getList(this.params)
       },
 
       // 物品类型格式化
-      classificationCodeFormatter (row) {
+      classificationCodeFormatter(row) {
         let itemName = '';
         this.typeList.map((item) => {
           if (item.prefix == row.classificationCode) {
@@ -354,7 +354,7 @@
 </script>
 
 <style lang="scss" scoped>
-  ::v-deep.page-title {
+  :deep(.page-title) {
     border-bottom: 1px solid #eaeefb;
     padding-bottom: 8px;
     margin-bottom: 16px;
@@ -392,7 +392,7 @@
     }
   }
 
-  ::v-deep.attribute-row {
+  :deep(.attribute-row) {
     padding: 20px 5px;
     background: #fff;
     margin-top: 10px;

Некоторые файлы не были показаны из-за большого количества измененных файлов