Merge remote-tracking branch 'origin/master' into master

Dockerfile

+FROM nginx:stable-alpine
+# 使用--from把上面产生的静态文件复制到nginx的运行目录
+COPY dist usr/share/nginx/html
+# nginx容器内部暴露的端口
+EXPOSE 8064
+# 运行的命令
+CMD [nginx, -g, daemon off;]
\ No newline at end of file

src/views/prod/edit.vue

@@ -274,12 +274,14 @@ export default {
           //form.tenantNo = this.tenantNo;
           //form.abutmentWay = 'API'
           let result;
-          if(this.appNo){
-            form.appNo = this.appNo;
-            result = await API.prod_update({ ...form });
-          }else{
-            result = await API.prod_add({ ...form });
-          }
+          form.appNo = this.appNo;
+          result = await API.prod_update({ ...form });
+          // if(this.appNo){
+          //   form.appNo = this.appNo;
+          //   result = await API.prod_update({ ...form });
+          // }else{
+          //   result = await API.prod_add({ ...form });
+          // }
 
           if (result.success) {
             this.$baseMessage("产品保存成功", "success");