新购机具问题修改

sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue

@@ -92,7 +92,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:role:add']"
-        >保存</el-button>
+        >新建</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -258,7 +258,7 @@ export default {
   data() {
     return {
       // 遮罩层
-      loading: true,
+      loading: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -339,7 +339,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
   },
   methods: {
     /** 查询角色列表 */

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue

@@ -105,7 +105,7 @@
      
 
     <!-- 验收弹窗 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="机具类型名称:" prop="machineTypeName">
           <el-input v-model="form.machineTypeName" placeholder="" disabled/>
@@ -126,15 +126,16 @@
         <el-form-item label="验收图片" prop="checkUrl">
           <el-upload 
                 :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
-                action="#" :limit='1'
+                action="#" 
                 :file-list="fileList"
-                :show-file-list="true"
+                :show-file-list="false"
                 list-type="picture-card"
                 accept=".png,.jpg,.jpeg"
                 :on-success="handleAvatarSuccess"
                 :on-preview="handlePictureCardPreview"
                 :on-remove="handleRemove">
-                <i class="el-icon-plus avatar-uploader-icon"></i>
+                <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
         </el-form-item>
       </el-form>
@@ -145,7 +146,7 @@
     </el-dialog>
 
         <!-- 批量验收弹窗 -->
-    <el-dialog :title="title" :visible.sync="openAll" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="openAll" width="650px" append-to-body>
       <el-form ref="aform" :model="aform" :rules="arules" label-width="120px">
       
         <el-form-item label="验收结论" prop="checkResult">
@@ -155,15 +156,16 @@
         <el-form-item label="验收图片" prop="checkUrl">
           <el-upload 
                 :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
-                action="#" :limit='1'
+                action="#" 
                 :file-list="fileList"
-                :show-file-list="true"
+                :show-file-list="false"
                 list-type="picture-card"
                 accept=".png,.jpg,.jpeg"
                 :on-success="handleAvatarSuccess"
                 :on-preview="handlePictureCardPreview"
                 :on-remove="handleRemove">
-                <i class="el-icon-plus avatar-uploader-icon"></i>
+                <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
         </el-form-item>
       </el-form>
@@ -306,7 +308,7 @@ export default {
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
       uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://10.40.92.140:9201',//本地测试
+      //  uploadUrl:'http://192.168.5.12:9201',//本地测试
       dialogImageUrl: '',
       dialogVisible: false,
       //--------------
@@ -376,6 +378,7 @@ export default {
     },
     // 取消按钮
     cancel() {
+      
       this.open = false;
       this.reset();
     },
@@ -389,7 +392,8 @@ export default {
         inputNum: undefined,
         checkUrl: undefined,
       };
-      // this.resetForm("form");
+      this.imageUrl = ''
+      this.resetForm("form");
     },
     
     /** 搜索按钮操作 */
@@ -584,6 +588,7 @@ export default {
       param.type = 'ma'
       imgUpLoad(param).then(res => {
         if(res.code == 200) {
+          this.imageUrl = res.data.fileUrl;
           if(this.open){
             this.form.checkUrl = res.data.fileUrl;
             this.form.checkUrlName = res.data.fileName;

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue

@@ -104,7 +104,7 @@
           <el-input v-model="form.typeId" disabled  v-show="false"/>
           <el-col :span="7">
             <el-form-item label="编码前缀" prop="exCode">
-              <el-input v-model="form.exCode" :readonly="true"/>
+              <el-input v-model="form.exCode" />
             </el-form-item>
           </el-col>
           <el-col :span="7">
@@ -331,9 +331,10 @@ export default {
       this.form = row;
       this.$set(this.form,'str','')
       this.$set(this.form,'str1','')
-      this.$set(this.form,'fixCode','1')
+      // this.$set(this.form,'fixCode','1')
        let arr = this.form.arrivalTime.split('-')
-      this.form.exCode = 'NSJJ'+this.form.typeCode+this.form.specsCode+arr[0][2]+arr[0][3]+arr[1];
+      // this.form.exCode = ;
+      this.$set(this.form,'exCode','NSJJ'+this.form.typeCode+this.form.specsCode+arr[0][2]+arr[0][3]+arr[1])
       this.form.count = row.checkNum;
       this.codeList=[]
       this.open = true;
@@ -382,7 +383,7 @@ export default {
       if(sum>this.form.checkNum){
         this.$modal.msgError("已绑定编码"+this.form.bindNum+"个,总数量已超过验收数量，请调整后缀范围。");
       }else{
-        if(num1>num){
+        if(num1=>num){
           for(let i = 0; i < count; i++) {
               let obj = {
                 typeName:this.form.typeName,
@@ -395,7 +396,7 @@ export default {
               }
               this.codeList.push(obj)
           }
-        }else{
+        }  else{
           this.$modal.msgError("编码后缀范围输入格式不正确");
         }
       }

sgzb-ui/src/views/store/tools/devices.vue

@@ -94,18 +94,14 @@
       <el-table-column label="物品种类" align="center" prop="itemType" />
       <el-table-column label="设备类型" align="center" prop="deviceType" :show-overflow-tooltip="true" />
       <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true">
-<!--        <template slot-scope="scope">-->
-<!--          <router-link :to="'/system/dict-data/index/' + scope.row.maId" class="link-type">-->
-<!--            <span>{{ scope.row.dictType }}</span>-->
-<!--          </router-link>-->
-<!--        </template>-->
       </el-table-column>
+      <el-table-column label="设备编码" align="center" prop="maCode" width="200" />
       <el-table-column label="设备状态" align="center" prop="maStatusName">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.maStatusName"/>
         </template>
       </el-table-column>
-      <el-table-column label="采购单号" align="center" prop="buyTask" />
+      <el-table-column label="采购单号" align="center" prop="buyTask" width="180"/>
       <el-table-column label="固定资产编号" align="center" prop="assetsCode" />
       <el-table-column label="设备原编号" align="center" prop="preCode" />
       

sgzb-ui/src/views/store/tools/toolsSupplier.vue

@@ -84,7 +84,7 @@
       <el-table-column label="主要经营范围" align="center" prop="businessScope" :show-overflow-tooltip="true" />
       <el-table-column label="营业执照" align="center" prop="businessLicense" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
-          <span @click="openImg(scope.row.businessLicense)" style="color: #02A7F0;"> 查看 </span>
+          <span v-if="scope.row.businessLicense" @click="openImg(scope.row.businessLicense)" style="color: #02A7F0;"> 查看 </span>
         </template>
       </el-table-column>
 
@@ -148,15 +148,16 @@
         <el-form-item label="营业执照" prop="businessLicense">
           <el-upload 
                 :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
-                action="#" :limit='1'
+                action="#" 
                 :file-list="fileList"
-                :show-file-list="true"
+                :show-file-list="false"
                 list-type="picture-card"
                 accept=".png,.jpg,.jpeg"
                 :on-success="handleAvatarSuccess"
                 :on-preview="handlePictureCardPreview"
                 :on-remove="handleRemove">
-                <i class="el-icon-plus avatar-uploader-icon"></i>
+                <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
         </el-form-item>
 
@@ -219,7 +220,7 @@ export default {
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
       uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://192.168.4.2:9201',//本地测试
+      // uploadUrl:'http://192.168.5.12:9201',//本地测试
       // 表单校验
       rules: {
         dictName: [
@@ -297,6 +298,7 @@ export default {
       const supplierId = row.supplierId || this.ids
       getSupplierInfo(supplierId).then(response => {
         this.form = response.data;
+        this.imageUrl = this.form.businessLicense
         this.open = true;
         this.title = "编辑";
       });

sgzb-ui/src/views/store/tools/toolsType.vue

@@ -275,14 +275,15 @@
                 :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
                 action="#" 
                 :file-list="fileList"
+                list-type="picture-card"
                 :show-file-list="false"
                 accept=".png,.jpg,.jpeg" 
                 :on-success="handleAvatarSuccess"
                 :on-preview="handlePictureCardPreview"
                 :on-remove="handleRemove">
-                <el-button size="small" type="primary" icon="el-icon-upload">上传</el-button>
+                <!-- <el-button size="small" type="primary" icon="el-icon-upload">上传</el-button> -->
                 <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar">
-                <!-- <i class="el-icon-plus avatar-uploader-icon"></i> -->
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
              
             </el-form-item>
@@ -455,8 +456,8 @@ export default {
       field101fileList:[],
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
+      uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
-      uploadUrl:'http://192.168.5.12:9201',//本地测试
+      // uploadUrl:'http://192.168.5.12:9201',//本地测试
       defaultProps: {
         children: "children",
         label: "label"
@@ -639,17 +640,13 @@ export default {
       const typeId = row.typeId || this.ids;
       getMaType(typeId).then(response => {
         this.form = response.data;
-        // let file = {
+        let file = {
-        //   name:this.form.documentName,
+          name:this.form.documentName,
-        //   type:this.form.documentUrl,
+          type:this.form.documentUrl,
-        // }
+        }
-        // this.field101fileList.push(file)
+        this.field101fileList.push(file)
-        // let img = {
-        //   name:this.form.photoName,
-        //   type:this.uploadUrl+this.form.photoUrl,
-        // }
-        // this.fileList.push(img)
 
+        this.imageUrl = this.form.photoUrl
         this.open = true;
         this.title = "修改";
       });

sgzb-ui/vue.config.js

@@ -36,9 +36,9 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         //192.168.0.14
-        // target: `http://112.29.103.165:21624`,//线上环境
+        target: `http://112.29.103.165:21624`,//线上环境
         // target: `http://192.168.0.14:21624`,//线上环境
-        target: `http://192.168.5.12:8080`,//丁
+        // target: `http://192.168.5.12:8080`,//丁
         // target: `http://10.40.92.138:8080`,//丁/
         // target: `http://10.40.92.126:8080`,//高
         // target: `http://10.40.92.111:8080`,//亮