Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue

@@ -125,6 +125,8 @@
 
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
+        this.imgList = []
+        this.submitdisabled = false
         this.$emit('doback')
       },
 
@@ -138,7 +140,7 @@
               this.formobj = resp.data
               for (var i = 0; i < resp.data.filePaths.length; i++) {
                 this.imgList.push({
-                  url: resp.data.filePaths[i].url
+                  url: resp.data.filePaths[i]
                 })
               }
             }
@@ -168,7 +170,7 @@
         console.log('backData》》》》', value)
         console.log('imgList', this.imgList)
         this.imgList = value
-
+        this.formobj.filePaths = []
         for (var i = 0; i < this.imgList.length; i++) {
           this.formobj.filePaths.push(this.imgList[i].url)
         }

yxt-as-ui/src/views/storage/oldPartsFactory/index.vue

@@ -79,19 +79,21 @@
             <el-table-column prop="actualReturnCount" label="实际返厂数量合计" width="180" align="center" />
             <el-table-column label="附件" align="center" width="100">
               <template slot-scope="scope">
-                <div style="color: #1890FF; text-decoration: underline ;" @click="showAdjunct(scope.row.filePaths)">查看
+                <div style="color: #1890FF; text-decoration: underline ;cursor: pointer;"
+                  @click="showAdjunct(scope.row.filePaths)">查看
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="返厂情况" align="center" width="100">
+            <el-table-column label="返厂情况" prop="state" align="center" width="100" />
-              <template slot-scope="scope">
+            <!--   <template slot-scope="scope">
                 <div style="color: #1890FF; text-decoration: underline ;">{{scope.row.state}}
                 </div>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="厂家确认情况" align="center" width="150">
               <template slot-scope="scope">
-                <div style="color: #1890FF; text-decoration: underline ;" @click="showDetail(scope.row)">
+                <div style="color: #1890FF; text-decoration: underline ;cursor: pointer;"
+                  v-show="scope.row.confirmSid!=''" @click="showDetail(scope.row)">
                   查看
                 </div>
               </template>
@@ -281,8 +283,10 @@
         this.dialogVisible = true
       },
       showDetail(row) {
+
+
         this.viewState = 5
-        this.$refs['manufacturerconfirmInfo'].showEdit(row.sid)
+        this.$refs['manufacturerconfirmInfo'].showEdit(row.confirmSid)
       },
       showResult(row) {