Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

src/views/production/safetyStock/encoderList.vue

@@ -268,7 +268,12 @@
                   content: '是否导出数据?',
                   onOk:  ()=> {
                     alertModal.loading("执行中，请稍后！")
-                    downFile('/encoder/encoder/exportXls', this.queryParam).then(data => {
+                    let param = this.queryParam;
+                    param['selections'] = ''
+                    if(this.selectedRowKeys && this.selectedRowKeys.length>0){
+                      param['selections'] = this.selectedRowKeys.join(",")
+                    }
+                    downFile('/encoder/encoder/exportXls', param).then(data => {
                       alertModal.closeLoading();
                       if (!data) {
                         this.$message.warning('文件下载失败')

src/views/production/safetyStock/modules/safetyStockListAdd.vue

@@ -47,7 +47,7 @@
                   
                   
                   <a-col :md="8" :sm="24" >
-                    <a-form-model-item label="料品属性" name='fixedLength' :labelCol="{offset: 1}">
+                    <a-form-model-item label="料品属性" name='attribute' :labelCol="{offset: 1}">
                         <a-input placeholder="" v-model="form.attribute" disabled />
                     </a-form-model-item>
                   </a-col>
@@ -179,6 +179,7 @@
                 console.log(this.form);
             },
             okData(data){
+              this.$set(this.form,'attribute',data.Code1)
               this.$set(this.form,'inventoryCode',data.Code)
               this.$set(this.form,'inventoryName',data.Name)
               this.$set(this.form,'specs',data.SPECS)